diff options
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Configuration/LibraryOptions.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Model/Configuration/ServerConfiguration.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamBuilder.cs | 3 |
3 files changed, 5 insertions, 9 deletions
diff --git a/MediaBrowser.Model/Configuration/LibraryOptions.cs b/MediaBrowser.Model/Configuration/LibraryOptions.cs index 9cd656fa7..07a821baf 100644 --- a/MediaBrowser.Model/Configuration/LibraryOptions.cs +++ b/MediaBrowser.Model/Configuration/LibraryOptions.cs @@ -30,6 +30,8 @@ /// <value>The metadata country code.</value> public string MetadataCountryCode { get; set; } + public string SeasonZeroDisplayName { get; set; } + public LibraryOptions() { EnablePhotos = true; @@ -37,6 +39,7 @@ PathInfos = new MediaPathInfo[] { }; EnableInternetProviders = true; EnableAutomaticSeriesGrouping = true; + SeasonZeroDisplayName = "Specials"; } } diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index ae04bbaab..7c7358845 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -78,12 +78,6 @@ namespace MediaBrowser.Model.Configuration public string MetadataNetworkPath { get; set; } /// <summary> - /// Gets or sets the display name of the season zero. - /// </summary> - /// <value>The display name of the season zero.</value> - public string SeasonZeroDisplayName { get; set; } - - /// <summary> /// Gets or sets the preferred metadata language. /// </summary> /// <value>The preferred metadata language.</value> @@ -239,8 +233,6 @@ namespace MediaBrowser.Model.Configuration SortRemoveCharacters = new[] { ",", "&", "-", "{", "}", "'" }; SortRemoveWords = new[] { "the", "a", "an" }; - SeasonZeroDisplayName = "Specials"; - UICulture = "en-us"; MetadataOptions = new[] diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index be0dd8e8d..3b68db802 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -794,7 +794,8 @@ namespace MediaBrowser.Model.Dlna if (applyConditions) { - foreach (var transcodingVideoCodec in ContainerProfile.SplitValue(transcodingProfile.VideoCodec)) + var transcodingVideoCodecs = ContainerProfile.SplitValue(transcodingProfile.VideoCodec); + foreach (var transcodingVideoCodec in transcodingVideoCodecs) { if (i.ContainsCodec(transcodingVideoCodec, transcodingProfile.Container)) { |