aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-11-17 12:41:58 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-11-17 12:41:58 -0500
commit6186d2809f598514695482ce683f15103970abc2 (patch)
treefcca42614c36955895896d1ef7c9ee1baf46e0a6
parente70782a4780305f1a36639d31b947a71f44548e9 (diff)
update cinema mode config
-rw-r--r--MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs4
-rw-r--r--MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs4
2 files changed, 5 insertions, 3 deletions
diff --git a/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs b/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs
index 28ae82da3c..dd6c77e66d 100644
--- a/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs
@@ -11,17 +11,19 @@ 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 string MediaInfoIntroPath { get; set; }
public bool EnableIntrosFromUpcomingDvdMovies { get; set; }
public bool EnableIntrosFromUpcomingStreamingMovies { get; set; }
public int TrailerLimit { get; set; }
+ public string[] Tags { get; set; }
public CinemaModeConfiguration()
{
EnableIntrosParentalControl = true;
EnableIntrosFromSimilarMovies = true;
TrailerLimit = 2;
+ Tags = new[] { "thx" };
}
}
}
diff --git a/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs b/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
index 2228455c1a..52ed2aa844 100644
--- a/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
+++ b/MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs
@@ -245,9 +245,9 @@ namespace MediaBrowser.Server.Implementations.Intros
.Where(_libraryManager.IsVideoFile));
}
- if (!string.IsNullOrWhiteSpace(options.CodecIntroPath))
+ if (!string.IsNullOrWhiteSpace(options.MediaInfoIntroPath))
{
- list.AddRange(_fileSystem.GetFilePaths(options.CodecIntroPath, true)
+ list.AddRange(_fileSystem.GetFilePaths(options.MediaInfoIntroPath, true)
.Where(_libraryManager.IsVideoFile));
}