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

fixes #2798, fixes #2799

Browse Source
This commit is contained in:
Luke Pulverenti
2017-08-13 16:15:07 -04:00
parent 9c5bfeddca
commit 0951819f00
9 changed files with 74 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Controller/Entities/TV/Series.cs
View File

@@ -25,8 +25,12 @@ namespace MediaBrowser.Controller.Entities.TV
RemoteTrailers = EmptyMediaUrlArray;
LocalTrailerIds = EmptyGuidArray;
RemoteTrailerIds = EmptyGuidArray;
AirDays = new DayOfWeek[] { };
}
public DayOfWeek[] AirDays { get; set; }
public string AirTime { get; set; }
[IgnoreDataMember]
public override bool SupportsAddingToPlaylist
{

8
MediaBrowser.Controller/Library/TVUtils.cs
View File

@@ -22,13 +22,13 @@ namespace MediaBrowser.Controller.Library
/// </summary>
/// <param name="day">The day.</param>
/// <returns>List{DayOfWeek}.</returns>
public static List<DayOfWeek> GetAirDays(string day)
public static DayOfWeek[] GetAirDays(string day)
{
if (!string.IsNullOrWhiteSpace(day))
{
if (day.Equals("Daily", StringComparison.OrdinalIgnoreCase))
{
return new List<DayOfWeek>
return new DayOfWeek[]
{
DayOfWeek.Sunday,
DayOfWeek.Monday,
@@ -44,13 +44,13 @@ namespace MediaBrowser.Controller.Library
if (Enum.TryParse(day, true, out value))
{
return new List<DayOfWeek>
return new DayOfWeek[]
{
value
};
}
return new List<DayOfWeek>();
return new DayOfWeek[]{};
}
return null;
}

4
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@@ -211,6 +211,10 @@ namespace MediaBrowser.Controller.MediaEncoding
{
return null;
}
if (string.Equals(container, "rtp", StringComparison.OrdinalIgnoreCase))
{
return null;
}
// Seeing reported failures here, not sure yet if this is related to specfying input format
if (string.Equals(container, "m4v", StringComparison.OrdinalIgnoreCase))