From 31b01cbb5645cdc71791c85f2607aafbc6568dbc Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 22 Sep 2017 16:33:01 -0400 Subject: add fixes for dng images --- MediaBrowser.Controller/Entities/UserView.cs | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'MediaBrowser.Controller/Entities/UserView.cs') diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs index 66174034d..57eeafe91 100644 --- a/MediaBrowser.Controller/Entities/UserView.cs +++ b/MediaBrowser.Controller/Entities/UserView.cs @@ -58,6 +58,14 @@ namespace MediaBrowser.Controller.Entities } } + public override double? GetDefaultPrimaryImageAspectRatio() + { + double value = 16; + value /= 9; + + return value; + } + public override int GetChildCount(User user) { return GetChildren(user, true).Count; -- cgit v1.2.3 From 1da8509ae5b09cb421ece67421f2a88544a2c940 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 1 Oct 2017 20:13:43 -0400 Subject: update playback settings --- Emby.Server.Implementations/Dto/DtoService.cs | 1 + MediaBrowser.Controller/Entities/BasePluginFolder.cs | 12 ++++++------ MediaBrowser.Controller/Entities/CollectionFolder.cs | 12 ++++++------ MediaBrowser.Controller/Entities/UserView.cs | 12 ++++++------ MediaBrowser.Controller/Entities/Video.cs | 8 ++++++++ SharedVersion.cs | 2 +- 6 files changed, 28 insertions(+), 19 deletions(-) (limited to 'MediaBrowser.Controller/Entities/UserView.cs') diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs index 5ef910e51..9f08c6462 100644 --- a/Emby.Server.Implementations/Dto/DtoService.cs +++ b/Emby.Server.Implementations/Dto/DtoService.cs @@ -1642,6 +1642,7 @@ namespace Emby.Server.Implementations.Dto return null; } + return null; _logger.Info("Getting image size for item type {0}", item.GetType().Name); try diff --git a/MediaBrowser.Controller/Entities/BasePluginFolder.cs b/MediaBrowser.Controller/Entities/BasePluginFolder.cs index d2459f208..c06f1cef4 100644 --- a/MediaBrowser.Controller/Entities/BasePluginFolder.cs +++ b/MediaBrowser.Controller/Entities/BasePluginFolder.cs @@ -43,12 +43,12 @@ namespace MediaBrowser.Controller.Entities } } - public override double? GetDefaultPrimaryImageAspectRatio() - { - double value = 16; - value /= 9; + //public override double? GetDefaultPrimaryImageAspectRatio() + //{ + // double value = 16; + // value /= 9; - return value; - } + // return value; + //} } } diff --git a/MediaBrowser.Controller/Entities/CollectionFolder.cs b/MediaBrowser.Controller/Entities/CollectionFolder.cs index 16630efe4..5fb9e517c 100644 --- a/MediaBrowser.Controller/Entities/CollectionFolder.cs +++ b/MediaBrowser.Controller/Entities/CollectionFolder.cs @@ -31,13 +31,13 @@ namespace MediaBrowser.Controller.Entities PhysicalFolderIds = EmptyGuidArray; } - public override double? GetDefaultPrimaryImageAspectRatio() - { - double value = 16; - value /= 9; + //public override double? GetDefaultPrimaryImageAspectRatio() + //{ + // double value = 16; + // value /= 9; - return value; - } + // return value; + //} [IgnoreDataMember] public override bool SupportsPlayedStatus diff --git a/MediaBrowser.Controller/Entities/UserView.cs b/MediaBrowser.Controller/Entities/UserView.cs index 57eeafe91..2152e65cf 100644 --- a/MediaBrowser.Controller/Entities/UserView.cs +++ b/MediaBrowser.Controller/Entities/UserView.cs @@ -58,13 +58,13 @@ namespace MediaBrowser.Controller.Entities } } - public override double? GetDefaultPrimaryImageAspectRatio() - { - double value = 16; - value /= 9; + //public override double? GetDefaultPrimaryImageAspectRatio() + //{ + // double value = 16; + // value /= 9; - return value; - } + // return value; + //} public override int GetChildCount(User user) { diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index ffb601dc4..8693d867c 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -78,6 +78,14 @@ namespace MediaBrowser.Controller.Entities } } + public override double? GetDefaultPrimaryImageAspectRatio() + { + double value = 16; + value /= 9; + + return value; + } + public override string CreatePresentationUniqueKey() { if (!string.IsNullOrWhiteSpace(PrimaryVersionId)) diff --git a/SharedVersion.cs b/SharedVersion.cs index a3ccb0b7a..5be0a1656 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.32.15")] +[assembly: AssemblyVersion("3.2.32.16")] -- cgit v1.2.3