aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-02 00:36:27 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-01-02 00:36:27 -0500
commitc93740461e5cef99deb378e587b75cf74950b94e (patch)
tree542acd03ad4501a00f4d1ea3f9ebe448728a15db /MediaBrowser.Server.Implementations/Library/LibraryManager.cs
parent24e1f9834a8116d2593917e087888a7de51892b1 (diff)
support audio sync transcoding
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library/LibraryManager.cs')
-rw-r--r--MediaBrowser.Server.Implementations/Library/LibraryManager.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index b4a4c7e9a..37a68b52b 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -1556,25 +1556,25 @@ namespace MediaBrowser.Server.Implementations.Library
{
// Types cannot be overridden, so go from the top down until we find a configured content type
- var type = GetTopFolderContentType(item);
+ var type = GetInheritedContentType(item);
if (!string.IsNullOrWhiteSpace(type))
{
return type;
}
- type = GetInheritedContentType(item);
+ return GetConfiguredContentType(item);
+ }
+
+ public string GetInheritedContentType(BaseItem item)
+ {
+ var type = GetTopFolderContentType(item);
if (!string.IsNullOrWhiteSpace(type))
{
return type;
}
- return GetConfiguredContentType(item);
- }
-
- public string GetInheritedContentType(BaseItem item)
- {
return item.Parents
.Select(GetConfiguredContentType)
.LastOrDefault(i => !string.IsNullOrWhiteSpace(i));