alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-22 01:54:42 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

3.2.30.21

Browse Source
This commit is contained in:
Luke Pulverenti
2017-09-15 02:32:20 -04:00
parent ce26d502a4
commit 106575e443
7 changed files with 149 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.Controller/Entities/IHasProgramAttributes.cs
View File

@@ -15,5 +15,6 @@ namespace MediaBrowser.Controller.Entities
bool IsPremiere { get; set; }
ProgramAudio? Audio { get; set; }
string EpisodeTitle { get; set; }
string ServiceName { get; set; }
}
}

17
MediaBrowser.Controller/LiveTv/LiveTvAudioRecording.cs
View File

@@ -89,24 +89,9 @@ namespace MediaBrowser.Controller.LiveTv
}
}
private static string EmbyServiceName = "Emby";
public override double? GetDefaultPrimaryImageAspectRatio()
{
var serviceName = ServiceName;
if (!IsMovie && !string.Equals(serviceName, EmbyServiceName, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(serviceName))
{
double value = 16;
value /= 9;
return value;
}
else
{
double value = 2;
value /= 3;
return value;
}
return LiveTvProgram.GetDefaultPrimaryImageAspectRatio(this);
}
public override string GetClientTypeName()

13
MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
View File

@@ -47,11 +47,10 @@ namespace MediaBrowser.Controller.LiveTv
return list;
}
private static string EmbyServiceName = "Emby";
public override double? GetDefaultPrimaryImageAspectRatio()
public static double? GetDefaultPrimaryImageAspectRatio(IHasProgramAttributes item)
{
var serviceName = ServiceName;
if (!IsMovie && !string.Equals(serviceName, EmbyServiceName, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(serviceName))
var serviceName = item.ServiceName;
if (!item.IsMovie && !string.Equals(serviceName, EmbyServiceName, StringComparison.OrdinalIgnoreCase))
{
double value = 16;
value /= 9;
@@ -67,6 +66,12 @@ namespace MediaBrowser.Controller.LiveTv
}
}
private static string EmbyServiceName = "Emby";
public override double? GetDefaultPrimaryImageAspectRatio()
{
return GetDefaultPrimaryImageAspectRatio(this);
}
[IgnoreDataMember]
public override SourceType SourceType
{

17
MediaBrowser.Controller/LiveTv/LiveTvVideoRecording.cs
View File

@@ -98,24 +98,9 @@ namespace MediaBrowser.Controller.LiveTv
return false;
}
private static string EmbyServiceName = "Emby";
public override double? GetDefaultPrimaryImageAspectRatio()
{
var serviceName = ServiceName;
if (!IsMovie && !string.Equals(serviceName, EmbyServiceName, StringComparison.OrdinalIgnoreCase) || !string.IsNullOrWhiteSpace(serviceName))
{
double value = 16;
value /= 9;
return value;
}
else
{
double value = 2;
value /= 3;
return value;
}
return LiveTvProgram.GetDefaultPrimaryImageAspectRatio(this);
}
[IgnoreDataMember]