aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/Library
diff options
context:
space:
mode:
Diffstat (limited to 'Emby.Server.Implementations/Library')
-rw-r--r--Emby.Server.Implementations/Library/LibraryManager.cs8
-rw-r--r--Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs2
2 files changed, 5 insertions, 5 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)
{
diff --git a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
index 806e20f00..70fe8d9ef 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Audio/MusicAlbumResolver.cs
@@ -163,7 +163,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.Audio
private bool IsMultiDiscFolder(string path, LibraryOptions libraryOptions)
{
- var namingOptions = ((LibraryManager)_libraryManager).GetNamingOptions(libraryOptions);
+ var namingOptions = ((LibraryManager)_libraryManager).GetNamingOptions();
var parser = new AlbumParser(namingOptions, new NullLogger());
var result = parser.ParseMultiPart(path);