Merge pull request #2728 from MediaBrowser/dev

Dev
This commit is contained in:
Luke 2017-06-25 13:51:13 -04:00 committed by GitHub
commit 24151f2b7a
5 changed files with 36 additions and 4 deletions

View File

@ -92,7 +92,20 @@ namespace MediaBrowser.Controller.LiveTv
public override double? GetDefaultPrimaryImageAspectRatio() 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() public override string GetClientTypeName()

View File

@ -108,6 +108,24 @@ namespace MediaBrowser.Controller.LiveTv
return false; return false;
} }
public override double? GetDefaultPrimaryImageAspectRatio()
{
if (IsMovie)
{
double value = 2;
value /= 3;
return value;
}
else
{
double value = 2;
value /= 3;
return value;
}
}
[IgnoreDataMember] [IgnoreDataMember]
public override bool SupportsLocalMetadata public override bool SupportsLocalMetadata
{ {

View File

@ -550,7 +550,7 @@ namespace MediaBrowser.Model.Dlna
if (audioStream != null && !audioSupported) if (audioStream != null && !audioSupported)
{ {
list.Add(TranscodeReason.VideoCodecNotSupported); list.Add(TranscodeReason.AudioCodecNotSupported);
} }
return list; return list;

View File

@ -38,6 +38,7 @@
ChannelUp = 30, ChannelUp = 30,
ChannelDown = 31, ChannelDown = 31,
SetMaxStreamingBitrate = 31, SetMaxStreamingBitrate = 31,
Guide = 32 Guide = 32,
ToggleStats = 33
} }
} }

View File

@ -1,3 +1,3 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.2.20.12")] [assembly: AssemblyVersion("3.2.20.13")]