diff options
| -rw-r--r-- | MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs | 16 |
2 files changed, 13 insertions, 4 deletions
diff --git a/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs b/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs index 764a7222f..28ae82da3 100644 --- a/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs +++ b/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs @@ -11,6 +11,7 @@ namespace MediaBrowser.Model.Configuration public bool EnableIntrosParentalControl { get; set; } public bool EnableIntrosFromSimilarMovies { get; set; } public string CustomIntroPath { get; set; } + public string CodecIntroPath { get; set; } public bool EnableIntrosFromUpcomingDvdMovies { get; set; } public bool EnableIntrosFromUpcomingStreamingMovies { get; set; } diff --git a/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs b/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs index e17739d53..2228455c1 100644 --- a/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs +++ b/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs @@ -237,13 +237,21 @@ namespace MediaBrowser.Server.Implementations.Intros { options = options ?? GetOptions(); - if (string.IsNullOrWhiteSpace(options.CustomIntroPath)) + var list = new List<string>(); + + if (!string.IsNullOrWhiteSpace(options.CustomIntroPath)) { - return new List<string>(); + list.AddRange(_fileSystem.GetFilePaths(options.CustomIntroPath, true) + .Where(_libraryManager.IsVideoFile)); } - return _fileSystem.GetFilePaths(options.CustomIntroPath, true) - .Where(_libraryManager.IsVideoFile); + if (!string.IsNullOrWhiteSpace(options.CodecIntroPath)) + { + list.AddRange(_fileSystem.GetFilePaths(options.CodecIntroPath, true) + .Where(_libraryManager.IsVideoFile)); + } + + return list.Distinct(StringComparer.OrdinalIgnoreCase); } private bool FilterByParentalRating(int? ratingLevel, BaseItem item) |