diff --git a/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs b/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs
index c9c4cbc43f..cd04a82121 100644
--- a/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs
+++ b/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs
@@ -556,7 +556,7 @@ namespace MediaBrowser.Api.DefaultTheme
// Avoid implicitly captured closure
var currentUserId1 = user.Id;
-
+
view.LatestMovies = movies
.OrderByDescending(i => i.DateCreated)
.Where(i => !_userDataManager.GetUserData(currentUserId1, i.GetUserDataKey()).Played)
@@ -622,9 +622,9 @@ namespace MediaBrowser.Api.DefaultTheme
{
var tag = _imageProcessor.GetImageCacheTag(item, imageType);
- if (tag.HasValue)
+ if (tag != null)
{
- stub.ImageTag = tag.Value;
+ stub.ImageTag = tag;
}
}
catch (Exception ex)
diff --git a/MediaBrowser.Api/DefaultTheme/Models.cs b/MediaBrowser.Api/DefaultTheme/Models.cs
index f261a9aff7..6cc7af4993 100644
--- a/MediaBrowser.Api/DefaultTheme/Models.cs
+++ b/MediaBrowser.Api/DefaultTheme/Models.cs
@@ -9,7 +9,7 @@ namespace MediaBrowser.Api.DefaultTheme
{
public string Name { get; set; }
public string Id { get; set; }
- public Guid ImageTag { get; set; }
+ public string ImageTag { get; set; }
public ImageType ImageType { get; set; }
}
diff --git a/MediaBrowser.Api/DisplayPreferencesService.cs b/MediaBrowser.Api/DisplayPreferencesService.cs
index 4060b42b49..16aafafb0e 100644
--- a/MediaBrowser.Api/DisplayPreferencesService.cs
+++ b/MediaBrowser.Api/DisplayPreferencesService.cs
@@ -77,15 +77,16 @@ namespace MediaBrowser.Api
/// The request.
public object Get(GetDisplayPreferences request)
{
- Guid displayPreferencesId;
+ var result = _displayPreferencesManager.GetDisplayPreferences(request.Id, request.UserId, request.Client);
- if (!Guid.TryParse(request.Id, out displayPreferencesId))
+ if (result == null)
{
- displayPreferencesId = request.Id.GetMD5();
+ result = new DisplayPreferences
+ {
+ Id = request.Id
+ };
}
- var result = _displayPreferencesManager.GetDisplayPreferences(displayPreferencesId, request.UserId, request.Client);
-
return ToOptimizedSerializedResultUsingCache(result);
}
diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index ce3eaf053d..a760819d65 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -548,7 +548,7 @@ namespace MediaBrowser.Api.Images
var contentType = GetMimeType(request.Format, imageInfo.Path);
- var cacheGuid = _imageProcessor.GetImageCacheTag(item, request.Type, imageInfo.Path, originalFileImageDateModified, supportedImageEnhancers);
+ var cacheGuid = new Guid(_imageProcessor.GetImageCacheTag(item, request.Type, imageInfo.Path, originalFileImageDateModified, supportedImageEnhancers));
TimeSpan? cacheDuration = null;
diff --git a/MediaBrowser.Api/PackageService.cs b/MediaBrowser.Api/PackageService.cs
index 948a67f16f..0a8f0d83f5 100644
--- a/MediaBrowser.Api/PackageService.cs
+++ b/MediaBrowser.Api/PackageService.cs
@@ -112,7 +112,7 @@ namespace MediaBrowser.Api
///
/// The id.
[ApiMember(Name = "Id", Description = "Installation Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
- public Guid Id { get; set; }
+ public string Id { get; set; }
}
///
@@ -221,7 +221,7 @@ namespace MediaBrowser.Api
/// The request.
public void Delete(CancelPackageInstallation request)
{
- var info = _installationManager.CurrentInstallations.FirstOrDefault(i => i.Item1.Id == request.Id);
+ var info = _installationManager.CurrentInstallations.FirstOrDefault(i => string.Equals(i.Item1.Id, request.Id));
if (info != null)
{
diff --git a/MediaBrowser.Api/SearchService.cs b/MediaBrowser.Api/SearchService.cs
index 662c728e46..db646344a8 100644
--- a/MediaBrowser.Api/SearchService.cs
+++ b/MediaBrowser.Api/SearchService.cs
@@ -171,9 +171,9 @@ namespace MediaBrowser.Api
var primaryImageTag = _imageProcessor.GetImageCacheTag(item, ImageType.Primary);
- if (primaryImageTag.HasValue)
+ if (primaryImageTag != null)
{
- result.PrimaryImageTag = primaryImageTag.Value;
+ result.PrimaryImageTag = primaryImageTag;
}
SetThumbImageInfo(result, item);
@@ -250,9 +250,9 @@ namespace MediaBrowser.Api
{
var tag = _imageProcessor.GetImageCacheTag(itemWithImage, ImageType.Thumb);
- if (tag.HasValue)
+ if (tag != null)
{
- hint.ThumbImageTag = tag.Value;
+ hint.ThumbImageTag = tag;
hint.ThumbImageItemId = itemWithImage.Id.ToString("N");
}
}
@@ -271,9 +271,9 @@ namespace MediaBrowser.Api
{
var tag = _imageProcessor.GetImageCacheTag(itemWithImage, ImageType.Backdrop);
- if (tag.HasValue)
+ if (tag != null)
{
- hint.BackdropImageTag = tag.Value;
+ hint.BackdropImageTag = tag;
hint.BackdropImageItemId = itemWithImage.Id.ToString("N");
}
}
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index d145dd054f..008730ef6d 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -1,5 +1,4 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Dto;
+using MediaBrowser.Controller.Dto;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Entities.TV;
@@ -8,7 +7,6 @@ using MediaBrowser.Controller.Session;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
using MediaBrowser.Model.Querying;
-using MediaBrowser.Model.Serialization;
using MediaBrowser.Model.Session;
using ServiceStack;
using System;
diff --git a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
index 4946241fd7..e488fd9bf1 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationHost.cs
@@ -13,6 +13,7 @@ using MediaBrowser.Common.Progress;
using MediaBrowser.Common.ScheduledTasks;
using MediaBrowser.Common.Security;
using MediaBrowser.Common.Updates;
+using MediaBrowser.Model.Events;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Serialization;
diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
index 8f3f9b0a6f..1e97de0c59 100644
--- a/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
+++ b/MediaBrowser.Common.Implementations/ScheduledTasks/ScheduledTaskWorker.cs
@@ -531,7 +531,7 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks
EndTimeUtc = endTime,
Status = status,
Name = Name,
- Id = Id
+ Id = Id.ToString("N")
};
if (ex != null)
diff --git a/MediaBrowser.Common.Implementations/ScheduledTasks/TaskManager.cs b/MediaBrowser.Common.Implementations/ScheduledTasks/TaskManager.cs
index 6605432fa9..cead5de04b 100644
--- a/MediaBrowser.Common.Implementations/ScheduledTasks/TaskManager.cs
+++ b/MediaBrowser.Common.Implementations/ScheduledTasks/TaskManager.cs
@@ -1,6 +1,7 @@
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Events;
using MediaBrowser.Common.ScheduledTasks;
+using MediaBrowser.Model.Events;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Serialization;
using MediaBrowser.Model.Tasks;
diff --git a/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs b/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs
index 18462ba9ba..92e5f894f5 100644
--- a/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs
+++ b/MediaBrowser.Common.Implementations/Updates/InstallationManager.cs
@@ -5,6 +5,7 @@ using MediaBrowser.Common.Plugins;
using MediaBrowser.Common.Progress;
using MediaBrowser.Common.Security;
using MediaBrowser.Common.Updates;
+using MediaBrowser.Model.Events;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Serialization;
using MediaBrowser.Model.Updates;
@@ -367,7 +368,7 @@ namespace MediaBrowser.Common.Implementations.Updates
var installationInfo = new InstallationInfo
{
- Id = Guid.NewGuid(),
+ Id = Guid.NewGuid().ToString("N"),
Name = package.name,
AssemblyGuid = package.guid,
UpdateClass = package.classification,
@@ -510,13 +511,14 @@ namespace MediaBrowser.Common.Implementations.Updates
cancellationToken.ThrowIfCancellationRequested();
// Validate with a checksum
- if (package.checksum != Guid.Empty) // support for legacy uploads for now
+ var packageChecksum = string.IsNullOrWhiteSpace(package.checksum) ? Guid.Empty : new Guid(package.checksum);
+ if (packageChecksum != Guid.Empty) // support for legacy uploads for now
{
using (var crypto = new MD5CryptoServiceProvider())
using (var stream = new BufferedStream(File.OpenRead(tempFile), 100000))
{
var check = Guid.Parse(BitConverter.ToString(crypto.ComputeHash(stream)).Replace("-", String.Empty));
- if (check != package.checksum)
+ if (check != packageChecksum)
{
throw new ApplicationException(string.Format("Download validation failed for {0}. Probably corrupted during transfer.", package.name));
}
diff --git a/MediaBrowser.Common/IApplicationHost.cs b/MediaBrowser.Common/IApplicationHost.cs
index ecd099711f..0e2fef1e6d 100644
--- a/MediaBrowser.Common/IApplicationHost.cs
+++ b/MediaBrowser.Common/IApplicationHost.cs
@@ -1,5 +1,5 @@
-using MediaBrowser.Common.Events;
-using MediaBrowser.Common.Plugins;
+using MediaBrowser.Common.Plugins;
+using MediaBrowser.Model.Events;
using MediaBrowser.Model.Updates;
using System;
using System.Collections.Generic;
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index 5e0d3aa245..1da1446492 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -59,7 +59,6 @@
-
diff --git a/MediaBrowser.Common/ScheduledTasks/ITaskManager.cs b/MediaBrowser.Common/ScheduledTasks/ITaskManager.cs
index 3948727837..38548801b2 100644
--- a/MediaBrowser.Common/ScheduledTasks/ITaskManager.cs
+++ b/MediaBrowser.Common/ScheduledTasks/ITaskManager.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Common.Events;
+using MediaBrowser.Model.Events;
using MediaBrowser.Model.Tasks;
using System;
using System.Collections.Generic;
diff --git a/MediaBrowser.Common/ScheduledTasks/ScheduledTaskHelpers.cs b/MediaBrowser.Common/ScheduledTasks/ScheduledTaskHelpers.cs
index 4364153c90..92c44dea12 100644
--- a/MediaBrowser.Common/ScheduledTasks/ScheduledTaskHelpers.cs
+++ b/MediaBrowser.Common/ScheduledTasks/ScheduledTaskHelpers.cs
@@ -38,7 +38,7 @@ namespace MediaBrowser.Common.ScheduledTasks
Name = task.Name,
CurrentProgressPercentage = task.CurrentProgress,
State = task.State,
- Id = task.Id,
+ Id = task.Id.ToString("N"),
LastExecutionResult = task.LastExecutionResult,
Triggers = task.Triggers.Select(GetTriggerInfo).ToList(),
Description = task.Description,
diff --git a/MediaBrowser.Common/Updates/IInstallationManager.cs b/MediaBrowser.Common/Updates/IInstallationManager.cs
index f162f8dc8c..592613c54c 100644
--- a/MediaBrowser.Common/Updates/IInstallationManager.cs
+++ b/MediaBrowser.Common/Updates/IInstallationManager.cs
@@ -1,5 +1,5 @@
-using MediaBrowser.Common.Events;
-using MediaBrowser.Common.Plugins;
+using MediaBrowser.Common.Plugins;
+using MediaBrowser.Model.Events;
using MediaBrowser.Model.Updates;
using System;
using System.Collections.Concurrent;
diff --git a/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs b/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
index 535e74feee..6a2343a009 100644
--- a/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
+++ b/MediaBrowser.Controller/Configuration/IServerConfigurationManager.cs
@@ -1,6 +1,6 @@
using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Events;
using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Events;
using System;
namespace MediaBrowser.Controller.Configuration
diff --git a/MediaBrowser.Controller/Drawing/IImageProcessor.cs b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
index ad5e622fc8..b0e44a2000 100644
--- a/MediaBrowser.Controller/Drawing/IImageProcessor.cs
+++ b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
@@ -55,7 +55,7 @@ namespace MediaBrowser.Controller.Drawing
/// The item.
/// The image.
/// Guid.
- Guid GetImageCacheTag(IHasImages item, ItemImageInfo image);
+ string GetImageCacheTag(IHasImages item, ItemImageInfo image);
///
/// Gets the image cache tag.
@@ -66,7 +66,7 @@ namespace MediaBrowser.Controller.Drawing
/// The date modified.
/// The image enhancers.
/// Guid.
- Guid GetImageCacheTag(IHasImages item, ImageType imageType, string originalImagePath, DateTime dateModified,
+ string GetImageCacheTag(IHasImages item, ImageType imageType, string originalImagePath, DateTime dateModified,
List imageEnhancers);
///
@@ -89,12 +89,12 @@ namespace MediaBrowser.Controller.Drawing
public static class ImageProcessorExtensions
{
- public static Guid? GetImageCacheTag(this IImageProcessor processor, IHasImages item, ImageType imageType)
+ public static string GetImageCacheTag(this IImageProcessor processor, IHasImages item, ImageType imageType)
{
return processor.GetImageCacheTag(item, imageType, 0);
}
- public static Guid? GetImageCacheTag(this IImageProcessor processor, IHasImages item, ImageType imageType, int imageIndex)
+ public static string GetImageCacheTag(this IImageProcessor processor, IHasImages item, ImageType imageType, int imageIndex)
{
var imageInfo = item.GetImageInfo(imageType, imageIndex);
diff --git a/MediaBrowser.Controller/Library/IUserManager.cs b/MediaBrowser.Controller/Library/IUserManager.cs
index c3b0748cf8..0a0174b6de 100644
--- a/MediaBrowser.Controller/Library/IUserManager.cs
+++ b/MediaBrowser.Controller/Library/IUserManager.cs
@@ -1,5 +1,5 @@
-using MediaBrowser.Common.Events;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Model.Events;
using System;
using System.Collections.Generic;
using System.Threading;
diff --git a/MediaBrowser.Controller/Persistence/IDisplayPreferencesRepository.cs b/MediaBrowser.Controller/Persistence/IDisplayPreferencesRepository.cs
index 4e56932eca..84fedebce5 100644
--- a/MediaBrowser.Controller/Persistence/IDisplayPreferencesRepository.cs
+++ b/MediaBrowser.Controller/Persistence/IDisplayPreferencesRepository.cs
@@ -34,6 +34,6 @@ namespace MediaBrowser.Controller.Persistence
/// The user id.
/// The client.
/// Task{DisplayPreferences}.
- DisplayPreferences GetDisplayPreferences(Guid displayPreferencesId, Guid userId, string client);
+ DisplayPreferences GetDisplayPreferences(string displayPreferencesId, Guid userId, string client);
}
}
diff --git a/MediaBrowser.Controller/Session/ISessionController.cs b/MediaBrowser.Controller/Session/ISessionController.cs
index d4612acb5a..9c818284d7 100644
--- a/MediaBrowser.Controller/Session/ISessionController.cs
+++ b/MediaBrowser.Controller/Session/ISessionController.cs
@@ -19,14 +19,6 @@ namespace MediaBrowser.Controller.Session
/// true if this instance is session active; otherwise, false.
bool IsSessionActive { get; }
- ///
- /// Sends the message command.
- ///
- /// The command.
- /// The cancellation token.
- /// Task.
- Task SendMessageCommand(MessageCommand command, CancellationToken cancellationToken);
-
///
/// Sends the play command.
///
diff --git a/MediaBrowser.Dlna/Didl/DidlBuilder.cs b/MediaBrowser.Dlna/Didl/DidlBuilder.cs
index 7c627104b4..1cd4a4cbdf 100644
--- a/MediaBrowser.Dlna/Didl/DidlBuilder.cs
+++ b/MediaBrowser.Dlna/Didl/DidlBuilder.cs
@@ -623,9 +623,7 @@ namespace MediaBrowser.Dlna.Didl
try
{
- var guid = _imageProcessor.GetImageCacheTag(item, ImageType.Primary);
-
- tag = guid.HasValue ? guid.Value.ToString("N") : null;
+ tag = _imageProcessor.GetImageCacheTag(item, ImageType.Primary);
}
catch
{
@@ -712,7 +710,7 @@ namespace MediaBrowser.Dlna.Didl
Height = height.Value,
Width = width.Value
- }, maxWidth: maxWidth, maxHeight: maxHeight);
+ }, null, null, maxWidth, maxHeight);
width = Convert.ToInt32(newSize.Width);
height = Convert.ToInt32(newSize.Height);
diff --git a/MediaBrowser.Dlna/PlayTo/DlnaController.cs b/MediaBrowser.Dlna/PlayTo/DlnaController.cs
index 673a7c2459..ab342d635e 100644
--- a/MediaBrowser.Dlna/PlayTo/DlnaController.cs
+++ b/MediaBrowser.Dlna/PlayTo/DlnaController.cs
@@ -355,11 +355,6 @@ namespace MediaBrowser.Dlna.PlayTo
return Task.FromResult(true);
}
- public Task SendMessageCommand(MessageCommand command, CancellationToken cancellationToken)
- {
- return Task.FromResult(true);
- }
-
#endregion
#region Playlist
diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
index 991fe3b2a2..7f8f4c3251 100644
--- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
+++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
@@ -278,6 +278,9 @@
Entities\VirtualFolderInfo.cs
+
+ Events\GenericEventArgs.cs
+
FileOrganization\FileOrganizationQuery.cs
diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index 771e739bc6..d65aef7f0d 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -265,6 +265,9 @@
Entities\VirtualFolderInfo.cs
+
+ Events\GenericEventArgs.cs
+
FileOrganization\FileOrganizationQuery.cs
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index c9f5f3ae79..bfc631c793 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -138,7 +138,7 @@ namespace MediaBrowser.Model.ApiClient
/// The notification id list.
/// if set to true [is read].
/// Task.
- Task MarkNotificationsRead(string userId, IEnumerable notificationIdList, bool isRead);
+ Task MarkNotificationsRead(string userId, IEnumerable notificationIdList, bool isRead);
///
/// Gets the notifications summary.
@@ -447,7 +447,7 @@ namespace MediaBrowser.Model.ApiClient
/// The id.
/// Task{TaskInfo}.
/// id
- Task GetScheduledTaskAsync(Guid id);
+ Task GetScheduledTaskAsync(string id);
///
/// Gets a user by id
@@ -581,6 +581,38 @@ namespace MediaBrowser.Model.ApiClient
/// Task.
Task SendCommandAsync(string sessionId, GeneralCommand command);
+ ///
+ /// Sends the string.
+ ///
+ /// The session identifier.
+ /// The text.
+ /// Task.
+ Task SendString(string sessionId, string text);
+
+ ///
+ /// Sets the volume.
+ ///
+ /// The session identifier.
+ /// The volume.
+ /// Task.
+ Task SetVolume(string sessionId, int volume);
+
+ ///
+ /// Sets the index of the audio stream.
+ ///
+ /// The session identifier.
+ /// The volume.
+ /// Task.
+ Task SetAudioStreamIndex(string sessionId, int? volume);
+
+ ///
+ /// Sets the index of the subtitle stream.
+ ///
+ /// The session identifier.
+ /// The volume.
+ /// Task.
+ Task SetSubtitleStreamIndex(string sessionId, int? volume);
+
///
/// Instructs the client to display a message to the user
///
@@ -632,7 +664,7 @@ namespace MediaBrowser.Model.ApiClient
/// The triggers.
/// Task{RequestResult}.
/// id
- Task UpdateScheduledTaskTriggersAsync(Guid id, TaskTriggerInfo[] triggers);
+ Task UpdateScheduledTaskTriggersAsync(string id, TaskTriggerInfo[] triggers);
///
/// Gets the display preferences.
diff --git a/MediaBrowser.Model/ApiClient/IServerEvents.cs b/MediaBrowser.Model/ApiClient/IServerEvents.cs
index e13f3cc2c2..8e46f3d9f0 100644
--- a/MediaBrowser.Model/ApiClient/IServerEvents.cs
+++ b/MediaBrowser.Model/ApiClient/IServerEvents.cs
@@ -1,4 +1,11 @@
-using System;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Events;
+using MediaBrowser.Model.Plugins;
+using MediaBrowser.Model.Session;
+using MediaBrowser.Model.Tasks;
+using MediaBrowser.Model.Updates;
+using System;
namespace MediaBrowser.Model.ApiClient
{
@@ -10,59 +17,59 @@ namespace MediaBrowser.Model.ApiClient
///
/// Occurs when [user deleted].
///
- event EventHandler UserDeleted;
+ event EventHandler> UserDeleted;
///
/// Occurs when [scheduled task started].
///
- event EventHandler ScheduledTaskStarted;
+ event EventHandler> ScheduledTaskStarted;
///
/// Occurs when [scheduled task ended].
///
- event EventHandler ScheduledTaskEnded;
+ event EventHandler> ScheduledTaskEnded;
///
/// Occurs when [package installing].
///
- event EventHandler PackageInstalling;
+ event EventHandler> PackageInstalling;
///
/// Occurs when [package installation failed].
///
- event EventHandler PackageInstallationFailed;
+ event EventHandler> PackageInstallationFailed;
///
/// Occurs when [package installation completed].
///
- event EventHandler PackageInstallationCompleted;
+ event EventHandler> PackageInstallationCompleted;
///
/// Occurs when [package installation cancelled].
///
- event EventHandler PackageInstallationCancelled;
+ event EventHandler> PackageInstallationCancelled;
///
/// Occurs when [user updated].
///
- event EventHandler UserUpdated;
+ event EventHandler> UserUpdated;
///
/// Occurs when [plugin uninstalled].
///
- event EventHandler PluginUninstalled;
+ event EventHandler> PluginUninstalled;
///
/// Occurs when [library changed].
///
- event EventHandler LibraryChanged;
+ event EventHandler> LibraryChanged;
///
/// Occurs when [browse command].
///
- event EventHandler BrowseCommand;
+ event EventHandler> BrowseCommand;
///
/// Occurs when [play command].
///
- event EventHandler PlayCommand;
+ event EventHandler> PlayCommand;
///
/// Occurs when [playstate command].
///
- event EventHandler PlaystateCommand;
+ event EventHandler> PlaystateCommand;
///
/// Occurs when [message command].
///
- event EventHandler MessageCommand;
+ event EventHandler> MessageCommand;
///
/// Occurs when [system command].
///
@@ -88,6 +95,22 @@ namespace MediaBrowser.Model.ApiClient
///
event EventHandler ServerShuttingDown;
///
+ /// Occurs when [send text command].
+ ///
+ event EventHandler> SendTextCommand;
+ ///
+ /// Occurs when [set volume command].
+ ///
+ event EventHandler> SetVolumeCommand;
+ ///
+ /// Occurs when [set audio stream index command].
+ ///
+ event EventHandler> SetAudioStreamIndexCommand;
+ ///
+ /// Occurs when [set video stream index command].
+ ///
+ event EventHandler> SetVideoStreamIndexCommand;
+ ///
/// Occurs when [sessions updated].
///
event EventHandler SessionsUpdated;
@@ -98,7 +121,7 @@ namespace MediaBrowser.Model.ApiClient
///
/// Occurs when [user data changed].
///
- event EventHandler UserDataChanged;
+ event EventHandler> UserDataChanged;
///
/// Occurs when [connected].
///
diff --git a/MediaBrowser.Model/ApiClient/ServerEventArgs.cs b/MediaBrowser.Model/ApiClient/ServerEventArgs.cs
index 6637edd745..ad0defe686 100644
--- a/MediaBrowser.Model/ApiClient/ServerEventArgs.cs
+++ b/MediaBrowser.Model/ApiClient/ServerEventArgs.cs
@@ -1,154 +1,8 @@
-using MediaBrowser.Model.Dto;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Plugins;
-using MediaBrowser.Model.Session;
-using MediaBrowser.Model.Tasks;
-using MediaBrowser.Model.Updates;
+using MediaBrowser.Model.Session;
using System;
namespace MediaBrowser.Model.ApiClient
{
- ///
- /// Class UserDeletedEventArgs
- ///
- public class UserDeletedEventArgs : EventArgs
- {
- ///
- /// Gets or sets the id.
- ///
- /// The id.
- public string Id { get; set; }
- }
-
- public class UserDataChangedEventArgs : EventArgs
- {
- ///
- /// Gets or sets the user.
- ///
- /// The user.
- public UserDataChangeInfo ChangeInfo { get; set; }
- }
-
- ///
- /// Class UserUpdatedEventArgs
- ///
- public class UserUpdatedEventArgs : EventArgs
- {
- ///
- /// Gets or sets the user.
- ///
- /// The user.
- public UserDto User { get; set; }
- }
-
- ///
- /// Class ScheduledTaskStartedEventArgs
- ///
- public class ScheduledTaskStartedEventArgs : EventArgs
- {
- ///
- /// Gets or sets the name.
- ///
- /// The name.
- public string Name { get; set; }
- }
-
- ///
- /// Class ScheduledTaskEndedEventArgs
- ///
- public class ScheduledTaskEndedEventArgs : EventArgs
- {
- ///
- /// Gets or sets the result.
- ///
- /// The result.
- public TaskResult Result { get; set; }
- }
-
- ///
- /// Class PackageInstallationEventArgs
- ///
- public class PackageInstallationEventArgs : EventArgs
- {
- ///
- /// Gets or sets the installation info.
- ///
- /// The installation info.
- public InstallationInfo InstallationInfo { get; set; }
- }
-
- ///
- /// Class PluginUninstallEventArgs
- ///
- public class PluginUninstallEventArgs : EventArgs
- {
- ///
- /// Gets or sets the plugin info.
- ///
- /// The plugin info.
- public PluginInfo PluginInfo { get; set; }
- }
-
- ///
- /// Class LibraryChangedEventArgs
- ///
- public class LibraryChangedEventArgs : EventArgs
- {
- ///
- /// Gets or sets the update info.
- ///
- /// The update info.
- public LibraryUpdateInfo UpdateInfo { get; set; }
- }
-
- ///
- /// Class BrowseRequestEventArgs
- ///
- public class BrowseRequestEventArgs : EventArgs
- {
- ///
- /// Gets or sets the request.
- ///
- /// The request.
- public BrowseRequest Request { get; set; }
- }
-
- ///
- /// Class PlayRequestEventArgs
- ///
- public class PlayRequestEventArgs : EventArgs
- {
- ///
- /// Gets or sets the request.
- ///
- /// The request.
- public PlayRequest Request { get; set; }
- }
-
- ///
- /// Class PlaystateRequestEventArgs
- ///
- public class PlaystateRequestEventArgs : EventArgs
- {
- ///
- /// Gets or sets the request.
- ///
- /// The request.
- public PlaystateRequest Request { get; set; }
- }
-
- ///
- /// Class MessageCommandEventArgs
- ///
- public class MessageCommandEventArgs : EventArgs
- {
- ///
- /// Gets or sets the request.
- ///
- /// The request.
- public MessageCommand Request { get; set; }
- }
-
///
/// Class SystemCommandEventArgs
///
diff --git a/MediaBrowser.Model/Configuration/MetadataOptions.cs b/MediaBrowser.Model/Configuration/MetadataOptions.cs
index d666f6ccea..7b2bcc178c 100644
--- a/MediaBrowser.Model/Configuration/MetadataOptions.cs
+++ b/MediaBrowser.Model/Configuration/MetadataOptions.cs
@@ -30,7 +30,7 @@ namespace MediaBrowser.Model.Configuration
public MetadataOptions(int backdropLimit, int minBackdropWidth)
{
- var imageOptions = new List
+ List imageOptions = new List
{
new ImageOption
{
@@ -52,14 +52,14 @@ namespace MediaBrowser.Model.Configuration
public int GetLimit(ImageType type)
{
- var option = ImageOptions.FirstOrDefault(i => i.Type == type);
+ ImageOption option = ImageOptions.FirstOrDefault(i => i.Type == type);
return option == null ? 1 : option.Limit;
}
public int GetMinWidth(ImageType type)
{
- var option = ImageOptions.FirstOrDefault(i => i.Type == type);
+ ImageOption option = ImageOptions.FirstOrDefault(i => i.Type == type);
return option == null ? 0 : option.MinWidth;
}
diff --git a/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs b/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
index a62508fb1a..b5f5dd1384 100644
--- a/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
+++ b/MediaBrowser.Model/Dlna/MediaFormatProfileResolver.cs
@@ -1,7 +1,6 @@
-using System;
+using MediaBrowser.Model.MediaInfo;
+using System;
using System.Collections.Generic;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.MediaInfo;
namespace MediaBrowser.Model.Dlna
{
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index 21441d36af..02cee0dce6 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -16,22 +16,22 @@ namespace MediaBrowser.Model.Dlna
{
ValidateAudioInput(options);
- var mediaSources = options.MediaSources;
+ List mediaSources = options.MediaSources;
// If the client wants a specific media soure, filter now
if (!string.IsNullOrEmpty(options.MediaSourceId))
{
// Avoid implicitly captured closure
- var mediaSourceId = options.MediaSourceId;
+ string mediaSourceId = options.MediaSourceId;
mediaSources = mediaSources
.Where(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase))
.ToList();
}
- var streams = mediaSources.Select(i => BuildAudioItem(i, options)).ToList();
+ List streams = mediaSources.Select(i => BuildAudioItem(i, options)).ToList();
- foreach (var stream in streams)
+ foreach (StreamInfo stream in streams)
{
stream.DeviceId = options.DeviceId;
stream.DeviceProfileId = options.Profile.Id;
@@ -44,22 +44,22 @@ namespace MediaBrowser.Model.Dlna
{
ValidateInput(options);
- var mediaSources = options.MediaSources;
+ List mediaSources = options.MediaSources;
// If the client wants a specific media soure, filter now
if (!string.IsNullOrEmpty(options.MediaSourceId))
{
// Avoid implicitly captured closure
- var mediaSourceId = options.MediaSourceId;
+ string mediaSourceId = options.MediaSourceId;
mediaSources = mediaSources
.Where(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase))
.ToList();
}
- var streams = mediaSources.Select(i => BuildVideoItem(i, options)).ToList();
+ List streams = mediaSources.Select(i => BuildVideoItem(i, options)).ToList();
- foreach (var stream in streams)
+ foreach (StreamInfo stream in streams)
{
stream.DeviceId = options.DeviceId;
stream.DeviceProfileId = options.Profile.Id;
@@ -78,7 +78,7 @@ namespace MediaBrowser.Model.Dlna
private StreamInfo BuildAudioItem(MediaSourceInfo item, AudioOptions options)
{
- var playlistItem = new StreamInfo
+ StreamInfo playlistItem = new StreamInfo
{
ItemId = options.ItemId,
MediaType = DlnaProfileType.Audio,
@@ -86,30 +86,30 @@ namespace MediaBrowser.Model.Dlna
RunTimeTicks = item.RunTimeTicks
};
- var maxBitrateSetting = options.MaxBitrate ?? options.Profile.MaxBitrate;
+ int? maxBitrateSetting = options.MaxBitrate ?? options.Profile.MaxBitrate;
- var audioStream = item.MediaStreams.FirstOrDefault(i => i.Type == MediaStreamType.Audio);
+ MediaStream audioStream = item.MediaStreams.FirstOrDefault(i => i.Type == MediaStreamType.Audio);
// Honor the max bitrate setting
if (IsAudioEligibleForDirectPlay(item, maxBitrateSetting))
{
- var directPlay = options.Profile.DirectPlayProfiles
+ DirectPlayProfile directPlay = options.Profile.DirectPlayProfiles
.FirstOrDefault(i => i.Type == playlistItem.MediaType && IsAudioDirectPlaySupported(i, item, audioStream));
if (directPlay != null)
{
- var audioCodec = audioStream == null ? null : audioStream.Codec;
+ string audioCodec = audioStream == null ? null : audioStream.Codec;
// Make sure audio codec profiles are satisfied
if (!string.IsNullOrEmpty(audioCodec))
{
- var conditionProcessor = new ConditionProcessor();
+ ConditionProcessor conditionProcessor = new ConditionProcessor();
- var conditions = options.Profile.CodecProfiles.Where(i => i.Type == CodecType.Audio && i.ContainsCodec(audioCodec))
+ IEnumerable conditions = options.Profile.CodecProfiles.Where(i => i.Type == CodecType.Audio && i.ContainsCodec(audioCodec))
.SelectMany(i => i.Conditions);
- var audioChannels = audioStream == null ? null : audioStream.Channels;
- var audioBitrate = audioStream == null ? null : audioStream.BitRate;
+ int? audioChannels = audioStream.Channels;
+ int? audioBitrate = audioStream.BitRate;
if (conditions.All(c => conditionProcessor.IsAudioConditionSatisfied(c, audioChannels, audioBitrate)))
{
@@ -122,7 +122,7 @@ namespace MediaBrowser.Model.Dlna
}
}
- var transcodingProfile = options.Profile.TranscodingProfiles
+ TranscodingProfile transcodingProfile = options.Profile.TranscodingProfiles
.FirstOrDefault(i => i.Type == playlistItem.MediaType);
if (transcodingProfile != null)
@@ -134,7 +134,7 @@ namespace MediaBrowser.Model.Dlna
playlistItem.AudioCodec = transcodingProfile.AudioCodec;
playlistItem.Protocol = transcodingProfile.Protocol;
- var audioTranscodingConditions = options.Profile.CodecProfiles
+ IEnumerable audioTranscodingConditions = options.Profile.CodecProfiles
.Where(i => i.Type == CodecType.Audio && i.ContainsCodec(transcodingProfile.AudioCodec))
.Take(1)
.SelectMany(i => i.Conditions);
@@ -144,7 +144,7 @@ namespace MediaBrowser.Model.Dlna
// Honor requested max channels
if (options.MaxAudioChannels.HasValue)
{
- var currentValue = playlistItem.MaxAudioChannels ?? options.MaxAudioChannels.Value;
+ int currentValue = playlistItem.MaxAudioChannels ?? options.MaxAudioChannels.Value;
playlistItem.MaxAudioChannels = Math.Min(options.MaxAudioChannels.Value, currentValue);
}
@@ -152,7 +152,7 @@ namespace MediaBrowser.Model.Dlna
// Honor requested max bitrate
if (maxBitrateSetting.HasValue)
{
- var currentValue = playlistItem.AudioBitrate ?? maxBitrateSetting.Value;
+ int currentValue = playlistItem.AudioBitrate ?? maxBitrateSetting.Value;
playlistItem.AudioBitrate = Math.Min(maxBitrateSetting.Value, currentValue);
}
@@ -163,7 +163,7 @@ namespace MediaBrowser.Model.Dlna
private StreamInfo BuildVideoItem(MediaSourceInfo item, VideoOptions options)
{
- var playlistItem = new StreamInfo
+ StreamInfo playlistItem = new StreamInfo
{
ItemId = options.ItemId,
MediaType = DlnaProfileType.Video,
@@ -171,15 +171,15 @@ namespace MediaBrowser.Model.Dlna
RunTimeTicks = item.RunTimeTicks
};
- var audioStream = item.MediaStreams.FirstOrDefault(i => i.Type == MediaStreamType.Audio);
- var videoStream = item.MediaStreams.FirstOrDefault(i => i.Type == MediaStreamType.Video);
+ MediaStream audioStream = item.MediaStreams.FirstOrDefault(i => i.Type == MediaStreamType.Audio);
+ MediaStream videoStream = item.MediaStreams.FirstOrDefault(i => i.Type == MediaStreamType.Video);
- var maxBitrateSetting = options.MaxBitrate ?? options.Profile.MaxBitrate;
+ int? maxBitrateSetting = options.MaxBitrate ?? options.Profile.MaxBitrate;
if (IsEligibleForDirectPlay(item, options, maxBitrateSetting))
{
// See if it can be direct played
- var directPlay = GetVideoDirectPlayProfile(options.Profile, item, videoStream, audioStream);
+ DirectPlayProfile directPlay = GetVideoDirectPlayProfile(options.Profile, item, videoStream, audioStream);
if (directPlay != null)
{
@@ -191,7 +191,7 @@ namespace MediaBrowser.Model.Dlna
}
// Can't direct play, find the transcoding profile
- var transcodingProfile = options.Profile.TranscodingProfiles
+ TranscodingProfile transcodingProfile = options.Profile.TranscodingProfiles
.FirstOrDefault(i => i.Type == playlistItem.MediaType);
if (transcodingProfile != null)
@@ -206,14 +206,14 @@ namespace MediaBrowser.Model.Dlna
playlistItem.AudioStreamIndex = options.AudioStreamIndex;
playlistItem.SubtitleStreamIndex = options.SubtitleStreamIndex;
- var videoTranscodingConditions = options.Profile.CodecProfiles
+ IEnumerable videoTranscodingConditions = options.Profile.CodecProfiles
.Where(i => i.Type == CodecType.Video && i.ContainsCodec(transcodingProfile.VideoCodec))
.Take(1)
.SelectMany(i => i.Conditions);
ApplyTranscodingConditions(playlistItem, videoTranscodingConditions);
- var audioTranscodingConditions = options.Profile.CodecProfiles
+ IEnumerable audioTranscodingConditions = options.Profile.CodecProfiles
.Where(i => i.Type == CodecType.VideoAudio && i.ContainsCodec(transcodingProfile.AudioCodec))
.Take(1)
.SelectMany(i => i.Conditions);
@@ -223,7 +223,7 @@ namespace MediaBrowser.Model.Dlna
// Honor requested max channels
if (options.MaxAudioChannels.HasValue)
{
- var currentValue = playlistItem.MaxAudioChannels ?? options.MaxAudioChannels.Value;
+ int currentValue = playlistItem.MaxAudioChannels ?? options.MaxAudioChannels.Value;
playlistItem.MaxAudioChannels = Math.Min(options.MaxAudioChannels.Value, currentValue);
}
@@ -231,7 +231,7 @@ namespace MediaBrowser.Model.Dlna
// Honor requested max bitrate
if (options.MaxAudioTranscodingBitrate.HasValue)
{
- var currentValue = playlistItem.AudioBitrate ?? options.MaxAudioTranscodingBitrate.Value;
+ int currentValue = playlistItem.AudioBitrate ?? options.MaxAudioTranscodingBitrate.Value;
playlistItem.AudioBitrate = Math.Min(options.MaxAudioTranscodingBitrate.Value, currentValue);
}
@@ -239,14 +239,14 @@ namespace MediaBrowser.Model.Dlna
// Honor max rate
if (maxBitrateSetting.HasValue)
{
- var videoBitrate = maxBitrateSetting.Value;
+ int videoBitrate = maxBitrateSetting.Value;
if (playlistItem.AudioBitrate.HasValue)
{
videoBitrate -= playlistItem.AudioBitrate.Value;
}
- var currentValue = playlistItem.VideoBitrate ?? videoBitrate;
+ int currentValue = playlistItem.VideoBitrate ?? videoBitrate;
playlistItem.VideoBitrate = Math.Min(videoBitrate, currentValue);
}
@@ -261,7 +261,7 @@ namespace MediaBrowser.Model.Dlna
MediaStream audioStream)
{
// See if it can be direct played
- var directPlay = profile.DirectPlayProfiles
+ DirectPlayProfile directPlay = profile.DirectPlayProfiles
.FirstOrDefault(i => i.Type == DlnaProfileType.Video && IsVideoDirectPlaySupported(i, mediaSource, videoStream, audioStream));
if (directPlay == null)
@@ -269,28 +269,28 @@ namespace MediaBrowser.Model.Dlna
return null;
}
- var container = mediaSource.Container;
+ string container = mediaSource.Container;
- var conditions = profile.ContainerProfiles
+ IEnumerable conditions = profile.ContainerProfiles
.Where(i => i.Type == DlnaProfileType.Video && i.GetContainers().Contains(container, StringComparer.OrdinalIgnoreCase))
.SelectMany(i => i.Conditions);
- var conditionProcessor = new ConditionProcessor();
+ ConditionProcessor conditionProcessor = new ConditionProcessor();
- var width = videoStream == null ? null : videoStream.Width;
- var height = videoStream == null ? null : videoStream.Height;
- var bitDepth = videoStream == null ? null : videoStream.BitDepth;
- var videoBitrate = videoStream == null ? null : videoStream.BitRate;
- var videoLevel = videoStream == null ? null : videoStream.Level;
- var videoProfile = videoStream == null ? null : videoStream.Profile;
- var videoFramerate = videoStream == null ? null : videoStream.AverageFrameRate ?? videoStream.AverageFrameRate;
+ int? width = videoStream == null ? null : videoStream.Width;
+ int? height = videoStream == null ? null : videoStream.Height;
+ int? bitDepth = videoStream == null ? null : videoStream.BitDepth;
+ int? videoBitrate = videoStream == null ? null : videoStream.BitRate;
+ double? videoLevel = videoStream == null ? null : videoStream.Level;
+ string videoProfile = videoStream == null ? null : videoStream.Profile;
+ float? videoFramerate = videoStream == null ? null : videoStream.AverageFrameRate ?? videoStream.AverageFrameRate;
- var audioBitrate = audioStream == null ? null : audioStream.BitRate;
- var audioChannels = audioStream == null ? null : audioStream.Channels;
- var audioProfile = audioStream == null ? null : audioStream.Profile;
+ int? audioBitrate = audioStream == null ? null : audioStream.BitRate;
+ int? audioChannels = audioStream == null ? null : audioStream.Channels;
+ string audioProfile = audioStream == null ? null : audioStream.Profile;
- var timestamp = videoStream == null ? TransportStreamTimestamp.None : mediaSource.Timestamp;
- var packetLength = videoStream == null ? null : videoStream.PacketLength;
+ TransportStreamTimestamp? timestamp = videoStream == null ? TransportStreamTimestamp.None : mediaSource.Timestamp;
+ int? packetLength = videoStream == null ? null : videoStream.PacketLength;
// Check container conditions
if (!conditions.All(i => conditionProcessor.IsVideoConditionSatisfied(i,
@@ -309,7 +309,7 @@ namespace MediaBrowser.Model.Dlna
return null;
}
- var videoCodec = videoStream == null ? null : videoStream.Codec;
+ string videoCodec = videoStream == null ? null : videoStream.Codec;
if (string.IsNullOrEmpty(videoCodec))
{
@@ -338,7 +338,7 @@ namespace MediaBrowser.Model.Dlna
if (audioStream != null)
{
- var audioCodec = audioStream.Codec;
+ string audioCodec = audioStream.Codec;
if (string.IsNullOrEmpty(audioCodec))
{
@@ -420,10 +420,10 @@ namespace MediaBrowser.Model.Dlna
private void ApplyTranscodingConditions(StreamInfo item, IEnumerable conditions)
{
- foreach (var condition in conditions
+ foreach (ProfileCondition condition in conditions
.Where(i => !string.IsNullOrEmpty(i.Value)))
{
- var value = condition.Value;
+ string value = condition.Value;
switch (condition.Property)
{
@@ -515,7 +515,7 @@ namespace MediaBrowser.Model.Dlna
if (profile.Container.Length > 0)
{
// Check container type
- var mediaContainer = item.Container ?? string.Empty;
+ string mediaContainer = item.Container ?? string.Empty;
if (!profile.GetContainers().Any(i => string.Equals(i, mediaContainer, StringComparison.OrdinalIgnoreCase)))
{
return false;
@@ -536,7 +536,7 @@ namespace MediaBrowser.Model.Dlna
if (profile.Container.Length > 0)
{
// Check container type
- var mediaContainer = item.Container ?? string.Empty;
+ string mediaContainer = item.Container ?? string.Empty;
if (!profile.GetContainers().Any(i => string.Equals(i, mediaContainer, StringComparison.OrdinalIgnoreCase)))
{
return false;
@@ -544,21 +544,21 @@ namespace MediaBrowser.Model.Dlna
}
// Check video codec
- var videoCodecs = profile.GetVideoCodecs();
+ List videoCodecs = profile.GetVideoCodecs();
if (videoCodecs.Count > 0)
{
- var videoCodec = videoStream == null ? null : videoStream.Codec;
+ string videoCodec = videoStream == null ? null : videoStream.Codec;
if (string.IsNullOrEmpty(videoCodec) || !videoCodecs.Contains(videoCodec, StringComparer.OrdinalIgnoreCase))
{
return false;
}
}
- var audioCodecs = profile.GetAudioCodecs();
+ List audioCodecs = profile.GetAudioCodecs();
if (audioCodecs.Count > 0)
{
// Check audio codecs
- var audioCodec = audioStream == null ? null : audioStream.Codec;
+ string audioCodec = audioStream == null ? null : audioStream.Codec;
if (string.IsNullOrEmpty(audioCodec) || !audioCodecs.Contains(audioCodec, StringComparer.OrdinalIgnoreCase))
{
return false;
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs
index fe49227e40..ae9806f974 100644
--- a/MediaBrowser.Model/Dlna/StreamInfo.cs
+++ b/MediaBrowser.Model/Dlna/StreamInfo.cs
@@ -79,9 +79,9 @@ namespace MediaBrowser.Model.Dlna
throw new ArgumentNullException(baseUrl);
}
- var dlnaCommand = BuildDlnaParam(this);
+ string dlnaCommand = BuildDlnaParam(this);
- var extension = string.IsNullOrEmpty(Container) ? string.Empty : "." + Container;
+ string extension = string.IsNullOrEmpty(Container) ? string.Empty : "." + Container;
baseUrl = baseUrl.TrimEnd('/');
@@ -98,11 +98,11 @@ namespace MediaBrowser.Model.Dlna
return string.Format("{0}/videos/{1}/stream{2}?{3}", baseUrl, ItemId, extension, dlnaCommand);
}
+ private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
+
private static string BuildDlnaParam(StreamInfo item)
{
- var usCulture = new CultureInfo("en-US");
-
- var list = new List
+ List list = new List
{
item.DeviceProfileId ?? string.Empty,
item.DeviceId ?? string.Empty,
@@ -110,16 +110,16 @@ namespace MediaBrowser.Model.Dlna
(item.IsDirectStream).ToString().ToLower(),
item.VideoCodec ?? string.Empty,
item.AudioCodec ?? string.Empty,
- item.AudioStreamIndex.HasValue ? item.AudioStreamIndex.Value.ToString(usCulture) : string.Empty,
- item.SubtitleStreamIndex.HasValue ? item.SubtitleStreamIndex.Value.ToString(usCulture) : string.Empty,
- item.VideoBitrate.HasValue ? item.VideoBitrate.Value.ToString(usCulture) : string.Empty,
- item.AudioBitrate.HasValue ? item.AudioBitrate.Value.ToString(usCulture) : string.Empty,
- item.MaxAudioChannels.HasValue ? item.MaxAudioChannels.Value.ToString(usCulture) : string.Empty,
- item.MaxFramerate.HasValue ? item.MaxFramerate.Value.ToString(usCulture) : string.Empty,
- item.MaxWidth.HasValue ? item.MaxWidth.Value.ToString(usCulture) : string.Empty,
- item.MaxHeight.HasValue ? item.MaxHeight.Value.ToString(usCulture) : string.Empty,
- item.StartPositionTicks.ToString(usCulture),
- item.VideoLevel.HasValue ? item.VideoLevel.Value.ToString(usCulture) : string.Empty
+ item.AudioStreamIndex.HasValue ? item.AudioStreamIndex.Value.ToString(UsCulture) : string.Empty,
+ item.SubtitleStreamIndex.HasValue ? item.SubtitleStreamIndex.Value.ToString(UsCulture) : string.Empty,
+ item.VideoBitrate.HasValue ? item.VideoBitrate.Value.ToString(UsCulture) : string.Empty,
+ item.AudioBitrate.HasValue ? item.AudioBitrate.Value.ToString(UsCulture) : string.Empty,
+ item.MaxAudioChannels.HasValue ? item.MaxAudioChannels.Value.ToString(UsCulture) : string.Empty,
+ item.MaxFramerate.HasValue ? item.MaxFramerate.Value.ToString(UsCulture) : string.Empty,
+ item.MaxWidth.HasValue ? item.MaxWidth.Value.ToString(UsCulture) : string.Empty,
+ item.MaxHeight.HasValue ? item.MaxHeight.Value.ToString(UsCulture) : string.Empty,
+ item.StartPositionTicks.ToString(UsCulture),
+ item.VideoLevel.HasValue ? item.VideoLevel.Value.ToString(UsCulture) : string.Empty
};
return string.Format("Params={0}", string.Join(";", list.ToArray()));
@@ -134,7 +134,7 @@ namespace MediaBrowser.Model.Dlna
{
if (MediaSource != null)
{
- var audioStreams = MediaSource.MediaStreams.Where(i => i.Type == MediaStreamType.Audio);
+ IEnumerable audioStreams = MediaSource.MediaStreams.Where(i => i.Type == MediaStreamType.Audio);
if (AudioStreamIndex.HasValue)
{
@@ -172,7 +172,7 @@ namespace MediaBrowser.Model.Dlna
{
get
{
- var stream = TargetAudioStream;
+ MediaStream stream = TargetAudioStream;
return stream == null ? null : stream.SampleRate;
}
}
@@ -184,7 +184,7 @@ namespace MediaBrowser.Model.Dlna
{
get
{
- var stream = TargetVideoStream;
+ MediaStream stream = TargetVideoStream;
return stream == null || !IsDirectStream ? null : stream.BitDepth;
}
}
@@ -196,7 +196,7 @@ namespace MediaBrowser.Model.Dlna
{
get
{
- var stream = TargetVideoStream;
+ MediaStream stream = TargetVideoStream;
return MaxFramerate.HasValue && !IsDirectStream
? MaxFramerate
: stream == null ? null : stream.AverageFrameRate ?? stream.RealFrameRate;
@@ -210,7 +210,7 @@ namespace MediaBrowser.Model.Dlna
{
get
{
- var stream = TargetVideoStream;
+ MediaStream stream = TargetVideoStream;
return VideoLevel.HasValue && !IsDirectStream
? VideoLevel
: stream == null ? null : stream.Level;
@@ -224,7 +224,7 @@ namespace MediaBrowser.Model.Dlna
{
get
{
- var stream = TargetVideoStream;
+ MediaStream stream = TargetVideoStream;
return !IsDirectStream
? null
: stream == null ? null : stream.PacketLength;
@@ -238,7 +238,7 @@ namespace MediaBrowser.Model.Dlna
{
get
{
- var stream = TargetVideoStream;
+ MediaStream stream = TargetVideoStream;
return !string.IsNullOrEmpty(VideoProfile) && !IsDirectStream
? VideoProfile
: stream == null ? null : stream.Profile;
@@ -252,7 +252,7 @@ namespace MediaBrowser.Model.Dlna
{
get
{
- var stream = TargetAudioStream;
+ MediaStream stream = TargetAudioStream;
return AudioBitrate.HasValue && !IsDirectStream
? AudioBitrate
: stream == null ? null : stream.BitRate;
@@ -266,8 +266,8 @@ namespace MediaBrowser.Model.Dlna
{
get
{
- var stream = TargetAudioStream;
- var streamChannels = stream == null ? null : stream.Channels;
+ MediaStream stream = TargetAudioStream;
+ int? streamChannels = stream == null ? null : stream.Channels;
return MaxAudioChannels.HasValue && !IsDirectStream
? (streamChannels.HasValue ? Math.Min(MaxAudioChannels.Value, streamChannels.Value) : MaxAudioChannels.Value)
@@ -282,7 +282,7 @@ namespace MediaBrowser.Model.Dlna
{
get
{
- var stream = TargetAudioStream;
+ MediaStream stream = TargetAudioStream;
return IsDirectStream
? (stream == null ? null : stream.Codec)
@@ -304,10 +304,10 @@ namespace MediaBrowser.Model.Dlna
if (RunTimeTicks.HasValue)
{
- var totalBitrate = TargetTotalBitrate;
+ int? totalBitrate = TargetTotalBitrate;
return totalBitrate.HasValue ?
- Convert.ToInt64(totalBitrate * TimeSpan.FromTicks(RunTimeTicks.Value).TotalSeconds) :
+ Convert.ToInt64(totalBitrate.Value * TimeSpan.FromTicks(RunTimeTicks.Value).TotalSeconds) :
(long?)null;
}
@@ -319,7 +319,7 @@ namespace MediaBrowser.Model.Dlna
{
get
{
- var stream = TargetVideoStream;
+ MediaStream stream = TargetVideoStream;
return VideoBitrate.HasValue && !IsDirectStream
? VideoBitrate
@@ -331,7 +331,7 @@ namespace MediaBrowser.Model.Dlna
{
get
{
- var defaultValue = string.Equals(Container, "m2ts", StringComparison.OrdinalIgnoreCase)
+ TransportStreamTimestamp defaultValue = string.Equals(Container, "m2ts", StringComparison.OrdinalIgnoreCase)
? TransportStreamTimestamp.Valid
: TransportStreamTimestamp.None;
@@ -353,17 +353,17 @@ namespace MediaBrowser.Model.Dlna
{
get
{
- var videoStream = TargetVideoStream;
+ MediaStream videoStream = TargetVideoStream;
if (videoStream != null && videoStream.Width.HasValue && videoStream.Height.HasValue)
{
- var size = new ImageSize
+ ImageSize size = new ImageSize
{
Width = videoStream.Width.Value,
Height = videoStream.Height.Value
};
- var newSize = DrawingUtils.Resize(size,
+ ImageSize newSize = DrawingUtils.Resize(size,
null,
null,
MaxWidth,
@@ -380,17 +380,17 @@ namespace MediaBrowser.Model.Dlna
{
get
{
- var videoStream = TargetVideoStream;
+ MediaStream videoStream = TargetVideoStream;
if (videoStream != null && videoStream.Width.HasValue && videoStream.Height.HasValue)
{
- var size = new ImageSize
+ ImageSize size = new ImageSize
{
Width = videoStream.Width.Value,
Height = videoStream.Height.Value
};
- var newSize = DrawingUtils.Resize(size,
+ ImageSize newSize = DrawingUtils.Resize(size,
null,
null,
MaxWidth,
diff --git a/MediaBrowser.Model/Drawing/DrawingUtils.cs b/MediaBrowser.Model/Drawing/DrawingUtils.cs
index e95b5e3752..ae483b6f67 100644
--- a/MediaBrowser.Model/Drawing/DrawingUtils.cs
+++ b/MediaBrowser.Model/Drawing/DrawingUtils.cs
@@ -16,7 +16,12 @@ namespace MediaBrowser.Model.Drawing
/// ImageSize.
public static ImageSize Scale(double currentWidth, double currentHeight, double scaleFactor)
{
- return Scale(new ImageSize { Width = currentWidth, Height = currentHeight }, scaleFactor);
+ return Scale(new ImageSize
+ {
+ Width = currentWidth,
+ Height = currentHeight
+
+ }, scaleFactor);
}
///
@@ -29,7 +34,7 @@ namespace MediaBrowser.Model.Drawing
{
var newWidth = size.Width * scaleFactor;
- return Resize(size.Width, size.Height, newWidth);
+ return Resize(size.Width, size.Height, newWidth, null, null, null);
}
///
@@ -42,9 +47,19 @@ namespace MediaBrowser.Model.Drawing
/// A max fixed width, if desired
/// A max fixed height, if desired
/// ImageSize.
- public static ImageSize Resize(double currentWidth, double currentHeight, double? width = null, double? height = null, double? maxWidth = null, double? maxHeight = null)
+ public static ImageSize Resize(double currentWidth,
+ double currentHeight,
+ double? width,
+ double? height,
+ double? maxWidth,
+ double? maxHeight)
{
- return Resize(new ImageSize { Width = currentWidth, Height = currentHeight }, width, height, maxWidth, maxHeight);
+ return Resize(new ImageSize
+ {
+ Width = currentWidth,
+ Height = currentHeight
+
+ }, width, height, maxWidth, maxHeight);
}
///
@@ -56,7 +71,11 @@ namespace MediaBrowser.Model.Drawing
/// A max fixed width, if desired
/// A max fixed height, if desired
/// A new size object
- public static ImageSize Resize(ImageSize size, double? width = null, double? height = null, double? maxWidth = null, double? maxHeight = null)
+ public static ImageSize Resize(ImageSize size,
+ double? width,
+ double? height,
+ double? maxWidth,
+ double? maxHeight)
{
double newWidth = size.Width;
double newHeight = size.Height;
@@ -79,13 +98,13 @@ namespace MediaBrowser.Model.Drawing
newWidth = width.Value;
}
- if (maxHeight.HasValue && maxHeight < newHeight)
+ if (maxHeight.HasValue && maxHeight.Value < newHeight)
{
newWidth = GetNewWidth(newHeight, newWidth, maxHeight.Value);
newHeight = maxHeight.Value;
}
- if (maxWidth.HasValue && maxWidth < newWidth)
+ if (maxWidth.HasValue && maxWidth.Value < newWidth)
{
newHeight = GetNewHeight(newHeight, newWidth, maxWidth.Value);
newWidth = maxWidth.Value;
@@ -186,7 +205,7 @@ namespace MediaBrowser.Model.Drawing
{
if (!string.IsNullOrEmpty(value))
{
- var parts = value.Split('-');
+ string[] parts = value.Split('-');
if (parts.Length == 2)
{
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index a4bb0646a3..f2434afe3a 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -311,7 +311,7 @@ namespace MediaBrowser.Model.Dto
/// Gets or sets the parent backdrop image tags.
///
/// The parent backdrop image tags.
- public List ParentBackdropImageTags { get; set; }
+ public List ParentBackdropImageTags { get; set; }
///
/// Gets or sets the local trailer count.
@@ -466,13 +466,13 @@ namespace MediaBrowser.Model.Dto
/// Gets or sets the album image tag.
///
/// The album image tag.
- public Guid? AlbumPrimaryImageTag { get; set; }
+ public string AlbumPrimaryImageTag { get; set; }
///
/// Gets or sets the series primary image tag.
///
/// The series primary image tag.
- public Guid? SeriesPrimaryImageTag { get; set; }
+ public string SeriesPrimaryImageTag { get; set; }
///
/// Gets or sets the album artist.
@@ -529,25 +529,25 @@ namespace MediaBrowser.Model.Dto
/// Gets or sets the image tags.
///
/// The image tags.
- public Dictionary ImageTags { get; set; }
+ public Dictionary ImageTags { get; set; }
///
/// Gets or sets the backdrop image tags.
///
/// The backdrop image tags.
- public List BackdropImageTags { get; set; }
+ public List BackdropImageTags { get; set; }
///
/// Gets or sets the screenshot image tags.
///
/// The screenshot image tags.
- public List ScreenshotImageTags { get; set; }
+ public List ScreenshotImageTags { get; set; }
///
/// Gets or sets the parent logo image tag.
///
/// The parent logo image tag.
- public Guid? ParentLogoImageTag { get; set; }
+ public string ParentLogoImageTag { get; set; }
///
/// If the item does not have a art, this will hold the Id of the Parent that has one.
@@ -559,13 +559,13 @@ namespace MediaBrowser.Model.Dto
/// Gets or sets the parent art image tag.
///
/// The parent art image tag.
- public Guid? ParentArtImageTag { get; set; }
+ public string ParentArtImageTag { get; set; }
///
/// Gets or sets the series thumb image tag.
///
/// The series thumb image tag.
- public Guid? SeriesThumbImageTag { get; set; }
+ public string SeriesThumbImageTag { get; set; }
///
/// Gets or sets the series studio.
@@ -583,7 +583,7 @@ namespace MediaBrowser.Model.Dto
/// Gets or sets the parent thumb image tag.
///
/// The parent thumb image tag.
- public Guid? ParentThumbImageTag { get; set; }
+ public string ParentThumbImageTag { get; set; }
///
/// Gets or sets the chapters.
diff --git a/MediaBrowser.Model/Dto/BaseItemPerson.cs b/MediaBrowser.Model/Dto/BaseItemPerson.cs
index 1cc3f722d9..376ba239d0 100644
--- a/MediaBrowser.Model/Dto/BaseItemPerson.cs
+++ b/MediaBrowser.Model/Dto/BaseItemPerson.cs
@@ -33,7 +33,7 @@ namespace MediaBrowser.Model.Dto
/// Gets or sets the primary image tag.
///
/// The primary image tag.
- public Guid? PrimaryImageTag { get; set; }
+ public string PrimaryImageTag { get; set; }
///
/// Gets a value indicating whether this instance has primary image.
@@ -44,7 +44,7 @@ namespace MediaBrowser.Model.Dto
{
get
{
- return PrimaryImageTag.HasValue;
+ return PrimaryImageTag != null;
}
}
diff --git a/MediaBrowser.Model/Dto/ChapterInfoDto.cs b/MediaBrowser.Model/Dto/ChapterInfoDto.cs
index 5a72110cea..09dd2d5820 100644
--- a/MediaBrowser.Model/Dto/ChapterInfoDto.cs
+++ b/MediaBrowser.Model/Dto/ChapterInfoDto.cs
@@ -27,7 +27,7 @@ namespace MediaBrowser.Model.Dto
/// Gets or sets the image tag.
///
/// The image tag.
- public Guid? ImageTag { get; set; }
+ public string ImageTag { get; set; }
///
/// Gets a value indicating whether this instance has image.
@@ -36,7 +36,7 @@ namespace MediaBrowser.Model.Dto
[IgnoreDataMember]
public bool HasImage
{
- get { return ImageTag.HasValue; }
+ get { return ImageTag != null; }
}
public event PropertyChangedEventHandler PropertyChanged;
diff --git a/MediaBrowser.Model/Dto/ImageInfo.cs b/MediaBrowser.Model/Dto/ImageInfo.cs
index 0850ee0a4e..fa3a38fcb0 100644
--- a/MediaBrowser.Model/Dto/ImageInfo.cs
+++ b/MediaBrowser.Model/Dto/ImageInfo.cs
@@ -23,7 +23,7 @@ namespace MediaBrowser.Model.Dto
///
/// The image tag
///
- public Guid ImageTag;
+ public string ImageTag;
///
/// Gets or sets the path.
diff --git a/MediaBrowser.Model/Dto/ImageOptions.cs b/MediaBrowser.Model/Dto/ImageOptions.cs
index 7fe162ff99..08ac7906a7 100644
--- a/MediaBrowser.Model/Dto/ImageOptions.cs
+++ b/MediaBrowser.Model/Dto/ImageOptions.cs
@@ -56,7 +56,7 @@ namespace MediaBrowser.Model.Dto
/// If set this will result in strong, unconditional response caching
///
/// The hash.
- public Guid? Tag { get; set; }
+ public string Tag { get; set; }
///
/// Gets or sets a value indicating whether [crop whitespace].
diff --git a/MediaBrowser.Model/Dto/ItemByNameCounts.cs b/MediaBrowser.Model/Dto/ItemByNameCounts.cs
index 31b6d2da0e..7c51f07bd1 100644
--- a/MediaBrowser.Model/Dto/ItemByNameCounts.cs
+++ b/MediaBrowser.Model/Dto/ItemByNameCounts.cs
@@ -7,7 +7,7 @@ namespace MediaBrowser.Model.Dto
///
public class ItemByNameCounts
{
- public Guid UserId { get; set; }
+ public string UserId { get; set; }
///
/// Gets or sets the total count.
diff --git a/MediaBrowser.Model/Dto/StudioDto.cs b/MediaBrowser.Model/Dto/StudioDto.cs
index 696213a40b..4f21784fda 100644
--- a/MediaBrowser.Model/Dto/StudioDto.cs
+++ b/MediaBrowser.Model/Dto/StudioDto.cs
@@ -21,7 +21,7 @@ namespace MediaBrowser.Model.Dto
/// Gets or sets the primary image tag.
///
/// The primary image tag.
- public Guid? PrimaryImageTag { get; set; }
+ public string PrimaryImageTag { get; set; }
///
/// Gets a value indicating whether this instance has primary image.
@@ -32,7 +32,7 @@ namespace MediaBrowser.Model.Dto
{
get
{
- return PrimaryImageTag.HasValue;
+ return PrimaryImageTag != null;
}
}
diff --git a/MediaBrowser.Model/Dto/UserDto.cs b/MediaBrowser.Model/Dto/UserDto.cs
index efbd64343d..c4a43c512f 100644
--- a/MediaBrowser.Model/Dto/UserDto.cs
+++ b/MediaBrowser.Model/Dto/UserDto.cs
@@ -28,7 +28,7 @@ namespace MediaBrowser.Model.Dto
/// Gets or sets the primary image tag.
///
/// The primary image tag.
- public Guid? PrimaryImageTag { get; set; }
+ public string PrimaryImageTag { get; set; }
///
/// Gets or sets a value indicating whether this instance has password.
@@ -73,7 +73,7 @@ namespace MediaBrowser.Model.Dto
[IgnoreDataMember]
public bool HasPrimaryImage
{
- get { return PrimaryImageTag.HasValue; }
+ get { return PrimaryImageTag != null; }
}
///
diff --git a/MediaBrowser.Model/Entities/BaseItemInfo.cs b/MediaBrowser.Model/Entities/BaseItemInfo.cs
index c2e6a7631d..88af18289c 100644
--- a/MediaBrowser.Model/Entities/BaseItemInfo.cs
+++ b/MediaBrowser.Model/Entities/BaseItemInfo.cs
@@ -46,7 +46,7 @@ namespace MediaBrowser.Model.Entities
/// Gets or sets the primary image tag.
///
/// The primary image tag.
- public Guid? PrimaryImageTag { get; set; }
+ public string PrimaryImageTag { get; set; }
///
/// Gets or sets the primary image item identifier.
@@ -58,7 +58,7 @@ namespace MediaBrowser.Model.Entities
/// Gets or sets the logo image tag.
///
/// The logo image tag.
- public Guid? LogoImageTag { get; set; }
+ public string LogoImageTag { get; set; }
///
/// Gets or sets the logo item identifier.
@@ -70,7 +70,7 @@ namespace MediaBrowser.Model.Entities
/// Gets or sets the thumb image tag.
///
/// The thumb image tag.
- public Guid? ThumbImageTag { get; set; }
+ public string ThumbImageTag { get; set; }
///
/// Gets or sets the thumb item identifier.
@@ -82,7 +82,7 @@ namespace MediaBrowser.Model.Entities
/// Gets or sets the thumb image tag.
///
/// The thumb image tag.
- public Guid? BackdropImageTag { get; set; }
+ public string BackdropImageTag { get; set; }
///
/// Gets or sets the thumb item identifier.
@@ -163,7 +163,7 @@ namespace MediaBrowser.Model.Entities
[IgnoreDataMember]
public bool HasPrimaryImage
{
- get { return PrimaryImageTag.HasValue; }
+ get { return PrimaryImageTag != null; }
}
public BaseItemInfo()
diff --git a/MediaBrowser.Model/Entities/DisplayPreferences.cs b/MediaBrowser.Model/Entities/DisplayPreferences.cs
index 829affd01a..62233ac275 100644
--- a/MediaBrowser.Model/Entities/DisplayPreferences.cs
+++ b/MediaBrowser.Model/Entities/DisplayPreferences.cs
@@ -36,7 +36,7 @@ namespace MediaBrowser.Model.Entities
/// Gets or sets the user id.
///
/// The user id.
- public Guid Id { get; set; }
+ public string Id { get; set; }
///
/// Gets or sets the type of the view.
///
@@ -105,7 +105,7 @@ namespace MediaBrowser.Model.Entities
{
var newWidth = PrimaryImageWidth / ImageScale;
- var size = DrawingUtils.Resize(PrimaryImageWidth, PrimaryImageHeight, newWidth);
+ var size = DrawingUtils.Resize(PrimaryImageWidth, PrimaryImageHeight, newWidth, null, null, null);
PrimaryImageWidth = Convert.ToInt32(size.Width);
PrimaryImageHeight = Convert.ToInt32(size.Height);
diff --git a/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs b/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs
index dca8cd5845..4371ddae49 100644
--- a/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs
+++ b/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs
@@ -12,41 +12,41 @@ namespace MediaBrowser.Model.Entities
/// Gets or sets the folders added to.
///
/// The folders added to.
- public List FoldersAddedTo { get; set; }
+ public List FoldersAddedTo { get; set; }
///
/// Gets or sets the folders removed from.
///
/// The folders removed from.
- public List FoldersRemovedFrom { get; set; }
+ public List FoldersRemovedFrom { get; set; }
///
/// Gets or sets the items added.
///
/// The items added.
- public List ItemsAdded { get; set; }
+ public List ItemsAdded { get; set; }
///
/// Gets or sets the items removed.
///
/// The items removed.
- public List ItemsRemoved { get; set; }
+ public List ItemsRemoved { get; set; }
///
/// Gets or sets the items updated.
///
/// The items updated.
- public List ItemsUpdated { get; set; }
+ public List ItemsUpdated { get; set; }
///
/// Initializes a new instance of the class.
///
public LibraryUpdateInfo()
{
- FoldersAddedTo = new List();
- FoldersRemovedFrom = new List();
- ItemsAdded = new List();
- ItemsRemoved = new List();
- ItemsUpdated = new List();
+ FoldersAddedTo = new List();
+ FoldersRemovedFrom = new List();
+ ItemsAdded = new List();
+ ItemsRemoved = new List();
+ ItemsUpdated = new List();
}
}
}
diff --git a/MediaBrowser.Common/Events/GenericEventArgs.cs b/MediaBrowser.Model/Events/GenericEventArgs.cs
similarity index 91%
rename from MediaBrowser.Common/Events/GenericEventArgs.cs
rename to MediaBrowser.Model/Events/GenericEventArgs.cs
index e7cf524d45..5a83419e19 100644
--- a/MediaBrowser.Common/Events/GenericEventArgs.cs
+++ b/MediaBrowser.Model/Events/GenericEventArgs.cs
@@ -1,6 +1,6 @@
using System;
-namespace MediaBrowser.Common.Events
+namespace MediaBrowser.Model.Events
{
///
/// Provides a generic EventArgs subclass that can hold any kind of object
diff --git a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
index fe6faf363f..3fec0ee56f 100644
--- a/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ChannelInfoDto.cs
@@ -39,7 +39,7 @@ namespace MediaBrowser.Model.LiveTv
/// Gets or sets the image tags.
///
/// The image tags.
- public Dictionary ImageTags { get; set; }
+ public Dictionary ImageTags { get; set; }
///
/// Gets or sets the number.
@@ -113,7 +113,7 @@ namespace MediaBrowser.Model.LiveTv
public ChannelInfoDto()
{
- ImageTags = new Dictionary();
+ ImageTags = new Dictionary();
MediaSources = new List();
}
diff --git a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
index f6b343bdbd..4e7ab82243 100644
--- a/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/ProgramInfoDto.cs
@@ -45,7 +45,7 @@ namespace MediaBrowser.Model.LiveTv
/// Gets or sets the channel primary image tag.
///
/// The channel primary image tag.
- public Guid? ChannelPrimaryImageTag { get; set; }
+ public string ChannelPrimaryImageTag { get; set; }
///
/// Gets or sets the play access.
@@ -136,7 +136,7 @@ namespace MediaBrowser.Model.LiveTv
/// Gets or sets the image tags.
///
/// The image tags.
- public Dictionary ImageTags { get; set; }
+ public Dictionary ImageTags { get; set; }
///
/// Gets or sets the user data.
@@ -211,7 +211,7 @@ namespace MediaBrowser.Model.LiveTv
public ProgramInfoDto()
{
Genres = new List();
- ImageTags = new Dictionary();
+ ImageTags = new Dictionary();
}
public event PropertyChangedEventHandler PropertyChanged;
diff --git a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
index de07382c0a..3705b7a29e 100644
--- a/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/RecordingInfoDto.cs
@@ -50,7 +50,7 @@ namespace MediaBrowser.Model.LiveTv
/// Gets or sets the channel primary image tag.
///
/// The channel primary image tag.
- public Guid? ChannelPrimaryImageTag { get; set; }
+ public string ChannelPrimaryImageTag { get; set; }
///
/// ChannelName of the recording.
@@ -224,7 +224,7 @@ namespace MediaBrowser.Model.LiveTv
/// Gets or sets the image tags.
///
/// The image tags.
- public Dictionary ImageTags { get; set; }
+ public Dictionary ImageTags { get; set; }
///
/// Gets or sets the user data.
@@ -253,7 +253,7 @@ namespace MediaBrowser.Model.LiveTv
public RecordingInfoDto()
{
Genres = new List();
- ImageTags = new Dictionary();
+ ImageTags = new Dictionary();
MediaSources = new List();
}
diff --git a/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs b/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
index 393233c1bf..7c590307fb 100644
--- a/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
+++ b/MediaBrowser.Model/LiveTv/SeriesTimerInfoDto.cs
@@ -43,7 +43,7 @@ namespace MediaBrowser.Model.LiveTv
/// Gets or sets the image tags.
///
/// The image tags.
- public Dictionary ImageTags { get; set; }
+ public Dictionary ImageTags { get; set; }
///
/// Gets a value indicating whether this instance has primary image.
@@ -57,7 +57,7 @@ namespace MediaBrowser.Model.LiveTv
public SeriesTimerInfoDto()
{
- ImageTags = new Dictionary();
+ ImageTags = new Dictionary();
Days = new List();
}
}
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index aaa29d21c0..1f72844223 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -97,6 +97,7 @@
+
diff --git a/MediaBrowser.Model/Search/SearchHint.cs b/MediaBrowser.Model/Search/SearchHint.cs
index 002200c0fd..4eced77062 100644
--- a/MediaBrowser.Model/Search/SearchHint.cs
+++ b/MediaBrowser.Model/Search/SearchHint.cs
@@ -47,13 +47,13 @@ namespace MediaBrowser.Model.Search
/// Gets or sets the image tag.
///
/// The image tag.
- public Guid? PrimaryImageTag { get; set; }
+ public string PrimaryImageTag { get; set; }
///
/// Gets or sets the thumb image tag.
///
/// The thumb image tag.
- public Guid? ThumbImageTag { get; set; }
+ public string ThumbImageTag { get; set; }
///
/// Gets or sets the thumb image item identifier.
@@ -65,7 +65,7 @@ namespace MediaBrowser.Model.Search
/// Gets or sets the backdrop image tag.
///
/// The backdrop image tag.
- public Guid? BackdropImageTag { get; set; }
+ public string BackdropImageTag { get; set; }
///
/// Gets or sets the backdrop image item identifier.
diff --git a/MediaBrowser.Model/Session/GeneralCommand.cs b/MediaBrowser.Model/Session/GeneralCommand.cs
index 071eac954a..98b3c50b31 100644
--- a/MediaBrowser.Model/Session/GeneralCommand.cs
+++ b/MediaBrowser.Model/Session/GeneralCommand.cs
@@ -49,6 +49,7 @@ namespace MediaBrowser.Model.Session
SetSubtitleStreamIndex = 24,
ToggleFullscreen = 25,
DisplayContent = 26,
- GoToSearch = 27
+ GoToSearch = 27,
+ DisplayMessage = 28
}
}
diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs
index cd6ecbbb21..0dc1195001 100644
--- a/MediaBrowser.Model/Session/SessionInfoDto.cs
+++ b/MediaBrowser.Model/Session/SessionInfoDto.cs
@@ -55,7 +55,7 @@ namespace MediaBrowser.Model.Session
/// Gets or sets the user primary image tag.
///
/// The user primary image tag.
- public Guid? UserPrimaryImageTag { get; set; }
+ public string UserPrimaryImageTag { get; set; }
///
/// Gets or sets the name of the user.
diff --git a/MediaBrowser.Model/Tasks/TaskInfo.cs b/MediaBrowser.Model/Tasks/TaskInfo.cs
index 8e795f22fe..83ee0b7e63 100644
--- a/MediaBrowser.Model/Tasks/TaskInfo.cs
+++ b/MediaBrowser.Model/Tasks/TaskInfo.cs
@@ -30,7 +30,7 @@ namespace MediaBrowser.Model.Tasks
/// Gets or sets the id.
///
/// The id.
- public Guid Id { get; set; }
+ public string Id { get; set; }
///
/// Gets or sets the last execution result.
diff --git a/MediaBrowser.Model/Tasks/TaskResult.cs b/MediaBrowser.Model/Tasks/TaskResult.cs
index c04d2f2fe6..e73b4c9a11 100644
--- a/MediaBrowser.Model/Tasks/TaskResult.cs
+++ b/MediaBrowser.Model/Tasks/TaskResult.cs
@@ -35,7 +35,7 @@ namespace MediaBrowser.Model.Tasks
/// Gets or sets the id.
///
/// The id.
- public Guid Id { get; set; }
+ public string Id { get; set; }
///
/// Gets or sets the error message.
diff --git a/MediaBrowser.Model/Updates/InstallationInfo.cs b/MediaBrowser.Model/Updates/InstallationInfo.cs
index 09b4975a86..b904a0e58d 100644
--- a/MediaBrowser.Model/Updates/InstallationInfo.cs
+++ b/MediaBrowser.Model/Updates/InstallationInfo.cs
@@ -11,7 +11,7 @@ namespace MediaBrowser.Model.Updates
/// Gets or sets the id.
///
/// The id.
- public Guid Id { get; set; }
+ public string Id { get; set; }
///
/// Gets or sets the name.
diff --git a/MediaBrowser.Model/Updates/PackageVersionInfo.cs b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
index 3b0a940190..b3d297e8ee 100644
--- a/MediaBrowser.Model/Updates/PackageVersionInfo.cs
+++ b/MediaBrowser.Model/Updates/PackageVersionInfo.cs
@@ -47,7 +47,7 @@ namespace MediaBrowser.Model.Updates
/// The STR.
/// The def.
/// System.String.
- private static string ValueOrDefault(string str, string def = "")
+ private static string ValueOrDefault(string str, string def)
{
return string.IsNullOrEmpty(str) ? def : str;
}
@@ -80,7 +80,7 @@ namespace MediaBrowser.Model.Updates
/// Gets or sets the source URL.
///
/// The source URL.
- public Guid checksum { get; set; }
+ public string checksum { get; set; }
///
/// Gets or sets the target filename.
diff --git a/MediaBrowser.Model/Web/QueryStringDictionary.cs b/MediaBrowser.Model/Web/QueryStringDictionary.cs
index 905fbb2151..6b035fa45b 100644
--- a/MediaBrowser.Model/Web/QueryStringDictionary.cs
+++ b/MediaBrowser.Model/Web/QueryStringDictionary.cs
@@ -122,50 +122,6 @@ namespace MediaBrowser.Model.Web
}
}
- ///
- /// Adds the specified name.
- ///
- /// The name.
- /// The value.
- /// value
- public void Add(string name, Guid value)
- {
- if (value == Guid.Empty)
- {
- throw new ArgumentNullException("value");
- }
-
- Add(name, value.ToString());
- }
-
- ///
- /// Adds if not empty.
- ///
- /// The name.
- /// The value.
- public void AddIfNotEmpty(string name, Guid value)
- {
- if (value != Guid.Empty)
- {
- Add(name, value);
- }
-
- Add(name, value);
- }
-
- ///
- /// Adds if not null.
- ///
- /// The name.
- /// The value.
- public void AddIfNotNull(string name, Guid? value)
- {
- if (value.HasValue)
- {
- Add(name, value.Value);
- }
- }
-
///
/// Adds the specified name.
///
diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs b/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs
index ba241931c8..2f1c9fd535 100644
--- a/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs
+++ b/MediaBrowser.Providers/MediaInfo/SubtitleDownloader.cs
@@ -91,9 +91,18 @@ namespace MediaBrowser.Providers.MediaInfo
return false;
}
+ var audioStreams = internalMediaStreams.Where(i => i.Type == MediaStreamType.Audio).ToList();
+ var defaultAudioStreams = audioStreams.Where(i => i.IsDefault).ToList();
+
+ // If none are marked as default, just take a guess
+ if (defaultAudioStreams.Count == 0)
+ {
+ defaultAudioStreams = audioStreams.Take(1).ToList();
+ }
+
// There's already a default audio stream for this language
if (skipIfAudioTrackMatches &&
- internalMediaStreams.Any(i => i.Type == MediaStreamType.Audio && i.IsDefault && string.Equals(i.Language, language, StringComparison.OrdinalIgnoreCase)))
+ defaultAudioStreams.Any(i => string.Equals(i.Language, language, StringComparison.OrdinalIgnoreCase)))
{
return false;
}
diff --git a/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs b/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs
index 1b53483c44..7b40b5673a 100644
--- a/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs
+++ b/MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs
@@ -1,11 +1,11 @@
-using MediaBrowser.Common.Events;
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Security;
using MediaBrowser.Controller.Subtitles;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Events;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Providers;
using OpenSubtitlesHandler;
diff --git a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
index ab79c6a1af..59267e8569 100644
--- a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
@@ -4,6 +4,7 @@ using MediaBrowser.Common.Implementations.Configuration;
using MediaBrowser.Controller;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Model.Configuration;
+using MediaBrowser.Model.Events;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Serialization;
using System;
diff --git a/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs b/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs
index c6c1ec050d..38f8128097 100644
--- a/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs
+++ b/MediaBrowser.Server.Implementations/Drawing/ImageProcessor.cs
@@ -649,7 +649,7 @@ namespace MediaBrowser.Server.Implementations.Drawing
/// The image.
/// Guid.
/// item
- public Guid GetImageCacheTag(IHasImages item, ItemImageInfo image)
+ public string GetImageCacheTag(IHasImages item, ItemImageInfo image)
{
if (item == null)
{
@@ -676,7 +676,7 @@ namespace MediaBrowser.Server.Implementations.Drawing
/// The image enhancers.
/// Guid.
/// item
- public Guid GetImageCacheTag(IHasImages item, ImageType imageType, string originalImagePath, DateTime dateModified, List imageEnhancers)
+ public string GetImageCacheTag(IHasImages item, ImageType imageType, string originalImagePath, DateTime dateModified, List imageEnhancers)
{
if (item == null)
{
@@ -696,14 +696,14 @@ namespace MediaBrowser.Server.Implementations.Drawing
// Optimization
if (imageEnhancers.Count == 0)
{
- return (originalImagePath + dateModified.Ticks).GetMD5();
+ return (originalImagePath + dateModified.Ticks).GetMD5().ToString("N");
}
// Cache name is created with supported enhancers combined with the last config change so we pick up new config changes
var cacheKeys = imageEnhancers.Select(i => i.GetConfigurationCacheKey(item, imageType)).ToList();
cacheKeys.Add(originalImagePath + dateModified.Ticks);
- return string.Join("|", cacheKeys.ToArray()).GetMD5();
+ return string.Join("|", cacheKeys.ToArray()).GetMD5().ToString("N");
}
///
diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index c88cefdb36..8a0d4ca49b 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -326,7 +326,7 @@ namespace MediaBrowser.Server.Implementations.Dto
///
/// The item.
/// List{System.String}.
- private List GetBackdropImageTags(BaseItem item)
+ private List GetBackdropImageTags(BaseItem item)
{
return GetCacheTags(item, ImageType.Backdrop).ToList();
}
@@ -336,26 +336,25 @@ namespace MediaBrowser.Server.Implementations.Dto
///
/// The item.
/// List{Guid}.
- private List GetScreenshotImageTags(BaseItem item)
+ private List GetScreenshotImageTags(BaseItem item)
{
var hasScreenshots = item as IHasScreenshots;
if (hasScreenshots == null)
{
- return new List();
+ return new List();
}
return GetCacheTags(item, ImageType.Screenshot).ToList();
}
- private IEnumerable GetCacheTags(BaseItem item, ImageType type)
+ private IEnumerable GetCacheTags(BaseItem item, ImageType type)
{
return item.GetImages(type)
.Select(p => GetImageCacheTag(item, p))
- .Where(i => i.HasValue)
- .Select(i => i.Value)
+ .Where(i => i != null)
.ToList();
}
- private Guid? GetImageCacheTag(BaseItem item, ImageType type)
+ private string GetImageCacheTag(BaseItem item, ImageType type)
{
try
{
@@ -368,7 +367,7 @@ namespace MediaBrowser.Server.Implementations.Dto
}
}
- private Guid? GetImageCacheTag(BaseItem item, ItemImageInfo image)
+ private string GetImageCacheTag(BaseItem item, ItemImageInfo image)
{
try
{
@@ -677,7 +676,7 @@ namespace MediaBrowser.Server.Implementations.Dto
dto.Genres = item.Genres;
}
- dto.ImageTags = new Dictionary();
+ dto.ImageTags = new Dictionary();
// Prevent implicitly captured closure
var currentItem = item;
@@ -685,9 +684,9 @@ namespace MediaBrowser.Server.Implementations.Dto
{
var tag = GetImageCacheTag(item, image);
- if (tag.HasValue)
+ if (tag != null)
{
- dto.ImageTags[image.Type] = tag.Value;
+ dto.ImageTags[image.Type] = tag;
}
}
@@ -1216,7 +1215,7 @@ namespace MediaBrowser.Server.Implementations.Dto
}
}
- var bitrate = i.TotalBitrate ??
+ var bitrate = i.TotalBitrate ??
info.MediaStreams.Where(m => m.Type != MediaStreamType.Subtitle && !string.Equals(m.Codec, "mjpeg", StringComparison.OrdinalIgnoreCase))
.Select(m => m.BitRate ?? 0)
.Sum();
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs b/MediaBrowser.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
index 59fa78a009..40eeea6517 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/LibraryChangedNotifier.cs
@@ -252,15 +252,15 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
return new LibraryUpdateInfo
{
- ItemsAdded = itemsAdded.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren)).Select(i => i.Id).Distinct().ToList(),
+ ItemsAdded = itemsAdded.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren)).Select(i => i.Id.ToString("N")).Distinct().ToList(),
- ItemsUpdated = itemsUpdated.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren)).Select(i => i.Id).Distinct().ToList(),
+ ItemsUpdated = itemsUpdated.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren)).Select(i => i.Id.ToString("N")).Distinct().ToList(),
- ItemsRemoved = itemsRemoved.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren, true)).Select(i => i.Id).Distinct().ToList(),
+ ItemsRemoved = itemsRemoved.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren, true)).Select(i => i.Id.ToString("N")).Distinct().ToList(),
- FoldersAddedTo = foldersAddedTo.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren)).Select(i => i.Id).Distinct().ToList(),
+ FoldersAddedTo = foldersAddedTo.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren)).Select(i => i.Id.ToString("N")).Distinct().ToList(),
- FoldersRemovedFrom = foldersRemovedFrom.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren)).Select(i => i.Id).Distinct().ToList()
+ FoldersRemovedFrom = foldersRemovedFrom.SelectMany(i => TranslatePhysicalItemToUserLibrary(i, user, collections, allRecursiveChildren)).Select(i => i.Id.ToString("N")).Distinct().ToList()
};
}
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifier.cs b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifier.cs
index 0081c62434..9d2de0f6d1 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifier.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifier.cs
@@ -11,6 +11,7 @@ using MediaBrowser.Controller.Plugins;
using MediaBrowser.Controller.Session;
using MediaBrowser.Model.Configuration;
using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Events;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Notifications;
using MediaBrowser.Model.Tasks;
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs b/MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs
index 0925ca86c4..773ee24a9d 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/ServerEventNotifier.cs
@@ -9,6 +9,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Plugins;
using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.Events;
using MediaBrowser.Model.Tasks;
using System;
using System.Threading;
diff --git a/MediaBrowser.Server.Implementations/Library/UserManager.cs b/MediaBrowser.Server.Implementations/Library/UserManager.cs
index 2ee843f09b..23303c41f6 100644
--- a/MediaBrowser.Server.Implementations/Library/UserManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/UserManager.cs
@@ -5,6 +5,7 @@ using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Persistence;
using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Events;
using MediaBrowser.Model.Logging;
using System;
using System.Collections.Generic;
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
index cf7358cced..7bf4846899 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
@@ -241,9 +241,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv
var imageTag = GetImageTag(recording);
- if (imageTag.HasValue)
+ if (imageTag != null)
{
- dto.ImageTags[ImageType.Primary] = imageTag.Value;
+ dto.ImageTags[ImageType.Primary] = imageTag;
}
if (user != null)
@@ -328,9 +328,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv
var imageTag = GetImageTag(info);
- if (imageTag.HasValue)
+ if (imageTag != null)
{
- dto.ImageTags[ImageType.Primary] = imageTag.Value;
+ dto.ImageTags[ImageType.Primary] = imageTag;
}
if (currentProgram != null)
@@ -389,9 +389,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv
var imageTag = GetImageTag(item);
- if (imageTag.HasValue)
+ if (imageTag != null)
{
- dto.ImageTags[ImageType.Primary] = imageTag.Value;
+ dto.ImageTags[ImageType.Primary] = imageTag;
}
if (user != null)
@@ -404,7 +404,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
return dto;
}
- private Guid? GetImageTag(IHasImages info)
+ private string GetImageTag(IHasImages info)
{
try
{
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs
index 9f6ec0f244..0b4d78de31 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteDisplayPreferencesRepository.cs
@@ -111,7 +111,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
{
throw new ArgumentNullException("displayPreferences");
}
- if (displayPreferences.Id == Guid.Empty)
+ if (string.IsNullOrWhiteSpace(displayPreferences.Id))
{
throw new ArgumentNullException("displayPreferences.Id");
}
@@ -132,7 +132,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
{
cmd.CommandText = "replace into userdisplaypreferences (id, userid, client, data) values (@1, @2, @3, @4)";
- cmd.Parameters.Add(cmd, "@1", DbType.Guid).Value = displayPreferences.Id;
+ cmd.Parameters.Add(cmd, "@1", DbType.Guid).Value = new Guid(displayPreferences.Id);
cmd.Parameters.Add(cmd, "@2", DbType.Guid).Value = userId;
cmd.Parameters.Add(cmd, "@3", DbType.String).Value = client;
cmd.Parameters.Add(cmd, "@4", DbType.Binary).Value = serialized;
@@ -183,9 +183,9 @@ namespace MediaBrowser.Server.Implementations.Persistence
/// The client.
/// Task{DisplayPreferences}.
/// item
- public DisplayPreferences GetDisplayPreferences(Guid displayPreferencesId, Guid userId, string client)
+ public DisplayPreferences GetDisplayPreferences(string displayPreferencesId, Guid userId, string client)
{
- if (displayPreferencesId == Guid.Empty)
+ if (string.IsNullOrWhiteSpace(displayPreferencesId))
{
throw new ArgumentNullException("displayPreferencesId");
}
@@ -193,7 +193,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
var cmd = _connection.CreateCommand();
cmd.CommandText = "select data from userdisplaypreferences where id = @id and userId=@userId and client=@client";
- cmd.Parameters.Add(cmd, "@id", DbType.Guid).Value = displayPreferencesId;
+ cmd.Parameters.Add(cmd, "@id", DbType.Guid).Value = new Guid(displayPreferencesId);
cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId;
cmd.Parameters.Add(cmd, "@client", DbType.String).Value = client;
@@ -208,7 +208,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
}
}
- return new DisplayPreferences { Id = displayPreferencesId };
+ return null;
}
///
diff --git a/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs b/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs
index cdaf03fbed..ad9db947aa 100644
--- a/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs
+++ b/MediaBrowser.Server.Implementations/Roku/RokuSessionController.cs
@@ -56,16 +56,6 @@ namespace MediaBrowser.Server.Implementations.Roku
return Task.FromResult(true);
}
- public Task SendMessageCommand(MessageCommand command, CancellationToken cancellationToken)
- {
- return SendCommand(new WebSocketMessage
- {
- MessageType = "MessageCommand",
- Data = command
-
- }, cancellationToken);
- }
-
public Task SendPlayCommand(PlayRequest command, CancellationToken cancellationToken)
{
return SendCommand(new WebSocketMessage
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index b187c8d6b0..ea709cd249 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Events;
+using System.Globalization;
+using MediaBrowser.Common.Events;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Drawing;
@@ -712,12 +713,20 @@ namespace MediaBrowser.Server.Implementations.Session
public Task SendMessageCommand(string controllingSessionId, string sessionId, MessageCommand command, CancellationToken cancellationToken)
{
- var session = GetSessionForRemoteControl(sessionId);
+ var generalCommand = new GeneralCommand
+ {
+ Name = GeneralCommandType.DisplayMessage.ToString()
+ };
- var controllingSession = GetSession(controllingSessionId);
- AssertCanControl(session, controllingSession);
+ generalCommand.Arguments["Header"] = command.Header;
+ generalCommand.Arguments["Text"] = command.Text;
- return session.SessionController.SendMessageCommand(command, cancellationToken);
+ if (command.TimeoutMs.HasValue)
+ {
+ generalCommand.Arguments["TimeoutMs"] = command.TimeoutMs.Value.ToString(CultureInfo.InvariantCulture);
+ }
+
+ return SendGeneralCommand(controllingSessionId, sessionId, generalCommand, cancellationToken);
}
public Task SendGeneralCommand(string controllingSessionId, string sessionId, GeneralCommand command, CancellationToken cancellationToken)
@@ -1199,7 +1208,7 @@ namespace MediaBrowser.Server.Implementations.Session
};
info.PrimaryImageTag = GetImageCacheTag(item, ImageType.Primary);
- if (info.PrimaryImageTag.HasValue)
+ if (info.PrimaryImageTag != null)
{
info.PrimaryImageItemId = GetDtoId(item);
}
@@ -1237,14 +1246,14 @@ namespace MediaBrowser.Server.Implementations.Session
info.Album = audio.Album;
info.Artists = audio.Artists;
- if (!info.PrimaryImageTag.HasValue)
+ if (info.PrimaryImageTag == null)
{
var album = audio.Parents.OfType().FirstOrDefault();
if (album != null && album.HasImage(ImageType.Primary))
{
info.PrimaryImageTag = GetImageCacheTag(album, ImageType.Primary);
- if (info.PrimaryImageTag.HasValue)
+ if (info.PrimaryImageTag != null)
{
info.PrimaryImageItemId = GetDtoId(album);
}
@@ -1345,7 +1354,7 @@ namespace MediaBrowser.Server.Implementations.Session
return info;
}
- private Guid? GetImageCacheTag(BaseItem item, ImageType type)
+ private string GetImageCacheTag(BaseItem item, ImageType type)
{
try
{
diff --git a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
index 4b0c25a87b..3b6ecd21e9 100644
--- a/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
+++ b/MediaBrowser.Server.Implementations/Session/WebSocketController.cs
@@ -57,18 +57,6 @@ namespace MediaBrowser.Server.Implementations.Session
return socket;
}
- public Task SendMessageCommand(MessageCommand command, CancellationToken cancellationToken)
- {
- var socket = GetActiveSocket();
-
- return socket.SendAsync(new WebSocketMessage
- {
- MessageType = "MessageCommand",
- Data = command
-
- }, cancellationToken);
- }
-
public Task SendPlayCommand(PlayRequest command, CancellationToken cancellationToken)
{
var socket = GetActiveSocket();