pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update tv

This commit is contained in:
Luke Pulverenti 2015-08-09 12:35:27 -04:00
parent 6c07e29882
commit 3a309db3c5
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
View File

@ -825,7 +825,7 @@ namespace MediaBrowser.Api.Playback.Hls
}
else
{
var keyFrameArg = string.Format(" -force_key_frames expr:gte(t,n_forced*{0})",
var keyFrameArg = string.Format(" -force_key_frames \"expr:gte(t,n_forced*{0})\"",
state.SegmentLength.ToString(UsCulture));
var hasGraphicalSubs = state.SubtitleStream != null && !state.SubtitleStream.IsTextSubtitleStream;

2
MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
View File

@ -100,7 +100,7 @@ namespace MediaBrowser.Api.Playback.Hls
args;
}
var keyFrameArg = string.Format(" -force_key_frames expr:gte(t,n_forced*{0})",
var keyFrameArg = string.Format(" -force_key_frames \"expr:gte(t,n_forced*{0})\"",
state.SegmentLength.ToString(UsCulture));
var hasGraphicalSubs = state.SubtitleStream != null && !state.SubtitleStream.IsTextSubtitleStream;

6
MediaBrowser.Server.Implementations/TV/TVSeriesManager.cs
View File

@ -137,6 +137,8 @@ namespace MediaBrowser.Server.Implementations.TV
var lastWatchedDate = DateTime.MinValue;
Episode nextUp = null;
var includeMissing = user.Configuration.DisplayMissingEpisodes;
// Go back starting with the most recent episodes
foreach (var episode in allEpisodes)
{
@ -154,7 +156,7 @@ namespace MediaBrowser.Server.Implementations.TV
}
else
{
if (episode.LocationType != LocationType.Virtual)
if (!episode.IsVirtualUnaired && (!episode.IsMissingEpisode || includeMissing))
{
nextUp = episode;
}
@ -166,7 +168,7 @@ namespace MediaBrowser.Server.Implementations.TV
return new Tuple<Episode, DateTime, bool>(nextUp, lastWatchedDate, false);
}
var firstEpisode = allEpisodes.LastOrDefault(i => i.LocationType != LocationType.Virtual && !i.IsPlayed(user));
var firstEpisode = allEpisodes.LastOrDefault(i => !i.IsVirtualUnaired && (!i.IsMissingEpisode || includeMissing) && !i.IsPlayed(user));
// Return the first episode
return new Tuple<Episode, DateTime, bool>(firstEpisode, DateTime.MinValue, true);