Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix layout quirks

Browse Source
This commit is contained in:
Luke Pulverenti 2016-08-09 01:10:17 -04:00
parent 112d5d6348
commit e52759786f
2 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Api/ApiEntryPoint.cs
View File

@ -63,6 +63,15 @@ namespace MediaBrowser.Api
Instance = this; Instance = this;
_sessionManager.PlaybackProgress += _sessionManager_PlaybackProgress; _sessionManager.PlaybackProgress += _sessionManager_PlaybackProgress;
_sessionManager.PlaybackStart += _sessionManager_PlaybackStart;
}
private void _sessionManager_PlaybackStart(object sender, PlaybackProgressEventArgs e)
{
if (!string.IsNullOrWhiteSpace(e.PlaySessionId))
{
PingTranscodingJob(e.PlaySessionId, e.IsPaused);
}
} }
void _sessionManager_PlaybackProgress(object sender, PlaybackProgressEventArgs e) void _sessionManager_PlaybackProgress(object sender, PlaybackProgressEventArgs e)
@ -401,7 +410,7 @@ namespace MediaBrowser.Api
} }
} }
Logger.Debug("Transcoding kill timer stopped for JobId {0} PlaySessionId {1}. Killing transcoding", job.Id, job.PlaySessionId); Logger.Info("Transcoding kill timer stopped for JobId {0} PlaySessionId {1}. Killing transcoding", job.Id, job.PlaySessionId);
KillTranscodingJob(job, true, path => true); KillTranscodingJob(job, true, path => true);
} }

62
MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
View File

@ -165,40 +165,40 @@ namespace MediaBrowser.Api.Playback.Progressive
} }
} }
// Not static but transcode cache file exists //// Not static but transcode cache file exists
if (isTranscodeCached) //if (isTranscodeCached && state.VideoRequest == null)
{ //{
var contentType = state.GetMimeType(outputPath); // var contentType = state.GetMimeType(outputPath);
try // try
{ // {
if (transcodingJob != null) // if (transcodingJob != null)
{ // {
ApiEntryPoint.Instance.OnTranscodeBeginRequest(transcodingJob); // ApiEntryPoint.Instance.OnTranscodeBeginRequest(transcodingJob);
} // }
return await ResultFactory.GetStaticFileResult(Request, new StaticFileResultOptions // return await ResultFactory.GetStaticFileResult(Request, new StaticFileResultOptions
{ // {
ResponseHeaders = responseHeaders, // ResponseHeaders = responseHeaders,
ContentType = contentType, // ContentType = contentType,
IsHeadRequest = isHeadRequest, // IsHeadRequest = isHeadRequest,
Path = outputPath, // Path = outputPath,
FileShare = FileShare.ReadWrite, // FileShare = FileShare.ReadWrite,
OnComplete = () => // OnComplete = () =>
{ // {
if (transcodingJob != null) // if (transcodingJob != null)
{ // {
ApiEntryPoint.Instance.OnTranscodeEndRequest(transcodingJob); // ApiEntryPoint.Instance.OnTranscodeEndRequest(transcodingJob);
} // }
} // }
}).ConfigureAwait(false); // }).ConfigureAwait(false);
} // }
finally // finally
{ // {
state.Dispose(); // state.Dispose();
} // }
} //}
// Need to start ffmpeg // Need to start ffmpeg
try try