diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-06-25 13:51:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-25 13:51:13 -0400 |
| commit | 24151f2b7a2f79809edc5286319cedcafece2d8a (patch) | |
| tree | f48d3645977156b1ad928709581d786db5d739c8 | |
| parent | 287178cbf5321ad3e4b21f2e2e374a272a136b75 (diff) | |
| parent | 31698e44246b5cae711fda529b13772cdf65bb8b (diff) | |
Merge pull request #2728 from MediaBrowser/dev
Dev
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs | 15 | ||||
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs | 18 | ||||
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamBuilder.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/Session/GeneralCommandType.cs | 3 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
5 files changed, 36 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs b/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs index 45786e795..9f8234402 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs @@ -92,7 +92,20 @@ namespace MediaBrowser.Controller.LiveTv public override double? GetDefaultPrimaryImageAspectRatio() { - return null; + if (IsMovie) + { + double value = 2; + value /= 3; + + return value; + } + else + { + double value = 2; + value /= 3; + + return value; + } } public override string GetClientTypeName() diff --git a/MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs b/MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs index 2b527c4b0..c29d3dc47 100644 --- a/MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs +++ b/MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs @@ -108,6 +108,24 @@ namespace MediaBrowser.Controller.LiveTv return false; } + public override double? GetDefaultPrimaryImageAspectRatio() + { + if (IsMovie) + { + double value = 2; + value /= 3; + + return value; + } + else + { + double value = 2; + value /= 3; + + return value; + } + } + [IgnoreDataMember] public override bool SupportsLocalMetadata { diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index b758d5ed5..ebfeb358e 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -550,7 +550,7 @@ namespace MediaBrowser.Model.Dlna if (audioStream != null && !audioSupported) { - list.Add(TranscodeReason.VideoCodecNotSupported); + list.Add(TranscodeReason.AudioCodecNotSupported); } return list; diff --git a/MediaBrowser.Model/Session/GeneralCommandType.cs b/MediaBrowser.Model/Session/GeneralCommandType.cs index 1a9651559..8dd0c29e4 100644 --- a/MediaBrowser.Model/Session/GeneralCommandType.cs +++ b/MediaBrowser.Model/Session/GeneralCommandType.cs @@ -38,6 +38,7 @@ ChannelUp = 30, ChannelDown = 31, SetMaxStreamingBitrate = 31, - Guide = 32 + Guide = 32, + ToggleStats = 33 } }
\ No newline at end of file diff --git a/SharedVersion.cs b/SharedVersion.cs index 6aaf3af83..d6bc167e6 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.20.12")] +[assembly: AssemblyVersion("3.2.20.13")] |