diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-06-27 16:57:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-27 16:57:21 -0400 |
| commit | f0aa3d2d606c02c4de58b45c7d1fd93812a6b202 (patch) | |
| tree | a8d3b0b7032a2785115eeb882a9ddf812262b8b1 /Emby.Server.Implementations/Library/LibraryManager.cs | |
| parent | a655666a1a8653412449c69380c81b171a3fc181 (diff) | |
| parent | 71308b5c29da6506bc294a6b4eb1f4a5b86ce0bd (diff) | |
Merge pull request #2730 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/Library/LibraryManager.cs')
| -rw-r--r-- | Emby.Server.Implementations/Library/LibraryManager.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs index 1a909549e..4846a5768 100644 --- a/Emby.Server.Implementations/Library/LibraryManager.cs +++ b/Emby.Server.Implementations/Library/LibraryManager.cs @@ -2365,7 +2365,7 @@ namespace Emby.Server.Implementations.Library public bool IsVideoFile(string path, LibraryOptions libraryOptions) { - var resolver = new VideoResolver(GetNamingOptions(libraryOptions), new NullLogger()); + var resolver = new VideoResolver(GetNamingOptions(), new NullLogger()); return resolver.IsVideoFile(path); } @@ -2376,7 +2376,7 @@ namespace Emby.Server.Implementations.Library public bool IsAudioFile(string path, LibraryOptions libraryOptions) { - var parser = new AudioFileParser(GetNamingOptions(libraryOptions)); + var parser = new AudioFileParser(GetNamingOptions()); return parser.IsAudioFile(path); } @@ -2533,13 +2533,13 @@ namespace Emby.Server.Implementations.Library return _namingOptionsWithoutOptimisticEpisodeDetection; } - return GetNamingOptions(new LibraryOptions()); + return GetNamingOptionsInternal(); } private NamingOptions _namingOptionsWithoutOptimisticEpisodeDetection; private NamingOptions _namingOptions; private string[] _videoFileExtensions; - public NamingOptions GetNamingOptions(LibraryOptions libraryOptions) + private NamingOptions GetNamingOptionsInternal() { if (_namingOptions == null) { |
