diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-10-01 20:14:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-01 20:14:10 -0400 |
| commit | 796f374359d75e22d2095b3f3a8f9b220cacde27 (patch) | |
| tree | 253f4c152432f2ca2f9fb074b05650359a7ec23c /MediaBrowser.Controller/Entities | |
| parent | 71ee865689a1fe8ffbc8cf6067b99f4ed9b12fbe (diff) | |
| parent | 1da8509ae5b09cb421ece67421f2a88544a2c940 (diff) | |
Merge pull request #2930 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/Entities')
| -rw-r--r-- | MediaBrowser.Controller/Entities/BasePluginFolder.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/CollectionFolder.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/UserView.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Video.cs | 8 |
4 files changed, 26 insertions, 18 deletions
diff --git a/MediaBrowser.Controller/Entities/BasePluginFolder.cs b/MediaBrowser.Controller/Entities/BasePluginFolder.cs index d2459f208c..c06f1cef4c 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 16630efe42..5fb9e517c8 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 57eeafe914..2152e65cfb 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 ffb601dc46..8693d867cc 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)) |