diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-09-14 15:24:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-14 15:24:21 -0400 |
| commit | bb5266ceba6be6044f5239036a08cb87482b1fda (patch) | |
| tree | 82d51b4d8580b92e8cebd4711cdeda8c0c114c3f /MediaBrowser.Controller/LiveTv | |
| parent | 77b7d1486ac7afd546f46649b7105187c1d636c5 (diff) | |
| parent | 4a9550e58486873a487684994a68109830501a69 (diff) | |
Merge pull request #2881 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/LiveTv')
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/LiveTvProgram.cs | 15 | ||||
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs | 8 |
3 files changed, 20 insertions, 11 deletions
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs b/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs index c29d73253..ac73f240a 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs @@ -89,12 +89,14 @@ namespace MediaBrowser.Controller.LiveTv } } + private static string EmbyServiceName = "Emby"; public override double? GetDefaultPrimaryImageAspectRatio() { - if (IsMovie) + var serviceName = ServiceName; + if (!IsMovie && !string.Equals(serviceName, EmbyServiceName, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(serviceName)) { - double value = 2; - value /= 3; + double value = 16; + value /= 9; return value; } diff --git a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs index 896615ad9..5c83f6412 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs @@ -53,13 +53,18 @@ namespace MediaBrowser.Controller.LiveTv var serviceName = ServiceName; if (!IsMovie && !string.Equals(serviceName, EmbyServiceName, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(serviceName)) { - return null; - } + double value = 16; + value /= 9; - double value = 2; - value /= 3; + return value; + } + else + { + double value = 2; + value /= 3; - return value; + return value; + } } [IgnoreDataMember] diff --git a/MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs b/MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs index 950949f37..9a744b8f8 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs @@ -98,12 +98,14 @@ namespace MediaBrowser.Controller.LiveTv return false; } + private static string EmbyServiceName = "Emby"; public override double? GetDefaultPrimaryImageAspectRatio() { - if (IsMovie) + var serviceName = ServiceName; + if (!IsMovie && !string.Equals(serviceName, EmbyServiceName, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(serviceName)) { - double value = 2; - value /= 3; + double value = 16; + value /= 9; return value; } |