Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-23 15:30:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix progress ping

Browse Source
This commit is contained in:
Luke Pulverenti 2016-03-21 23:15:26 -04:00
parent 95250b9f22
commit e15a4328fb
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MediaBrowser.Api/ApiEntryPoint.cs
View File

@ -300,26 +300,31 @@ namespace MediaBrowser.Api
PingTimer(job, false); PingTimer(job, false);
} }
} }
internal void PingTranscodingJob(string playSessionId) internal void PingTranscodingJob(string playSessionId, bool? isUserPaused)
{ {
if (string.IsNullOrEmpty(playSessionId)) if (string.IsNullOrEmpty(playSessionId))
{ {
throw new ArgumentNullException("playSessionId"); throw new ArgumentNullException("playSessionId");
} }
//Logger.Debug("PingTranscodingJob PlaySessionId={0}", playSessionId); //Logger.Debug("PingTranscodingJob PlaySessionId={0} isUsedPaused: {1}", playSessionId, isUserPaused);
var jobs = new List<TranscodingJob>(); List<TranscodingJob> jobs;
lock (_activeTranscodingJobs) lock (_activeTranscodingJobs)
{ {
// This is really only needed for HLS. // This is really only needed for HLS.
// Progressive streams can stop on their own reliably // Progressive streams can stop on their own reliably
jobs = jobs.Where(j => string.Equals(playSessionId, j.PlaySessionId, StringComparison.OrdinalIgnoreCase)).ToList(); jobs = _activeTranscodingJobs.Where(j => string.Equals(playSessionId, j.PlaySessionId, StringComparison.OrdinalIgnoreCase)).ToList();
} }
foreach (var job in jobs) foreach (var job in jobs)
{ {
if (isUserPaused.HasValue)
{
//Logger.Debug("Setting job.IsUserPaused to {0}. jobId: {1}", isUserPaused, job.Id);
job.IsUserPaused = isUserPaused.Value;
}
PingTimer(job, true); PingTimer(job, true);
} }
} }
@ -655,6 +660,7 @@ namespace MediaBrowser.Api
public object ProcessLock = new object(); public object ProcessLock = new object();
public bool HasExited { get; set; } public bool HasExited { get; set; }
public bool IsUserPaused { get; set; }
public string Id { get; set; } public string Id { get; set; }

4
MediaBrowser.Api/UserLibrary/PlaystateService.cs
View File

@ -337,7 +337,7 @@ namespace MediaBrowser.Api.UserLibrary
{ {
if (!string.IsNullOrWhiteSpace(request.PlaySessionId)) if (!string.IsNullOrWhiteSpace(request.PlaySessionId))
{ {
ApiEntryPoint.Instance.PingTranscodingJob(request.PlaySessionId); ApiEntryPoint.Instance.PingTranscodingJob(request.PlaySessionId, request.IsPaused);
} }
request.SessionId = GetSession().Result.Id; request.SessionId = GetSession().Result.Id;
@ -349,7 +349,7 @@ namespace MediaBrowser.Api.UserLibrary
public void Post(PingPlaybackSession request) public void Post(PingPlaybackSession request)
{ {
ApiEntryPoint.Instance.PingTranscodingJob(request.PlaySessionId); ApiEntryPoint.Instance.PingTranscodingJob(request.PlaySessionId, null);
} }
/// <summary> /// <summary>