diff options
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Drawing/ImageOverlay.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dto/ImageOptions.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Model/System/SystemInfo.cs | 13 | ||||
| -rw-r--r-- | MediaBrowser.Model/Tasks/TaskInfo.cs | 5 |
4 files changed, 11 insertions, 14 deletions
diff --git a/MediaBrowser.Model/Drawing/ImageOverlay.cs b/MediaBrowser.Model/Drawing/ImageOverlay.cs index 9b6400f1c..e5c7e0fb7 100644 --- a/MediaBrowser.Model/Drawing/ImageOverlay.cs +++ b/MediaBrowser.Model/Drawing/ImageOverlay.cs @@ -7,10 +7,6 @@ namespace MediaBrowser.Model.Drawing public enum ImageOverlay { /// <summary> - /// The none - /// </summary> - None, - /// <summary> /// The watched /// </summary> Watched diff --git a/MediaBrowser.Model/Dto/ImageOptions.cs b/MediaBrowser.Model/Dto/ImageOptions.cs index 427656186..c5c89b0b2 100644 --- a/MediaBrowser.Model/Dto/ImageOptions.cs +++ b/MediaBrowser.Model/Dto/ImageOptions.cs @@ -72,14 +72,13 @@ namespace MediaBrowser.Model.Dto public ImageOutputFormat Format { get; set; } - public ImageOverlay Indicator { get; set; } + public ImageOverlay? Indicator { get; set; } public ImageOptions() { EnableImageEnhancers = true; Format = ImageOutputFormat.Original; - Indicator = ImageOverlay.None; } } } diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs index 959ec44c8..f77856c6e 100644 --- a/MediaBrowser.Model/System/SystemInfo.cs +++ b/MediaBrowser.Model/System/SystemInfo.cs @@ -1,4 +1,5 @@ using MediaBrowser.Model.Updates; +using System.Collections.Generic; namespace MediaBrowser.Model.System { @@ -35,7 +36,7 @@ namespace MediaBrowser.Model.System /// Gets or sets the in progress installations. /// </summary> /// <value>The in progress installations.</value> - public InstallationInfo[] InProgressInstallations { get; set; } + public List<InstallationInfo> InProgressInstallations { get; set; } /// <summary> /// Gets or sets the web socket port number. @@ -47,7 +48,7 @@ namespace MediaBrowser.Model.System /// Gets or sets the completed installations. /// </summary> /// <value>The completed installations.</value> - public InstallationInfo[] CompletedInstallations { get; set; } + public List<InstallationInfo> CompletedInstallations { get; set; } /// <summary> /// Gets or sets a value indicating whether [supports native web socket]. @@ -59,7 +60,7 @@ namespace MediaBrowser.Model.System /// Gets or sets plugin assemblies that failed to load. /// </summary> /// <value>The failed assembly loads.</value> - public string[] FailedPluginAssemblies { get; set; } + public List<string> FailedPluginAssemblies { get; set; } /// <summary> /// Gets or sets the id. @@ -84,11 +85,11 @@ namespace MediaBrowser.Model.System /// </summary> public SystemInfo() { - InProgressInstallations = new InstallationInfo[] { }; + InProgressInstallations = new List<InstallationInfo>(); - CompletedInstallations = new InstallationInfo[] { }; + CompletedInstallations = new List<InstallationInfo>(); - FailedPluginAssemblies = new string[] { }; + FailedPluginAssemblies = new List<string>(); } } } diff --git a/MediaBrowser.Model/Tasks/TaskInfo.cs b/MediaBrowser.Model/Tasks/TaskInfo.cs index 58d9cac15..dee4fea7f 100644 --- a/MediaBrowser.Model/Tasks/TaskInfo.cs +++ b/MediaBrowser.Model/Tasks/TaskInfo.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; namespace MediaBrowser.Model.Tasks { @@ -41,7 +42,7 @@ namespace MediaBrowser.Model.Tasks /// Gets or sets the triggers. /// </summary> /// <value>The triggers.</value> - public TaskTriggerInfo[] Triggers { get; set; } + public List<TaskTriggerInfo> Triggers { get; set; } /// <summary> /// Gets or sets the description. @@ -60,7 +61,7 @@ namespace MediaBrowser.Model.Tasks /// </summary> public TaskInfo() { - Triggers = new TaskTriggerInfo[] {}; + Triggers = new List<TaskTriggerInfo>(); } } } |