starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-24 01:34:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

added HasUpdateAvailable

Browse Source
This commit is contained in:
Luke Pulverenti
2014-01-05 01:50:48 -05:00
parent 178d216b28
commit a01ee815fb
6 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@@ -864,7 +864,7 @@ namespace MediaBrowser.Api.Playback
/// </summary>
/// <param name="process">The process.</param>
/// <param name="state">The state.</param>
protected void OnFfMpegProcessExited(Process process, StreamState state)
protected async void OnFfMpegProcessExited(Process process, StreamState state)
{
if (state.IsoMount != null)
{
@@ -889,6 +889,18 @@ namespace MediaBrowser.Api.Playback
{
Logger.Info("FFMpeg exited with an error for {0}", outputFilePath);
}
if (!string.IsNullOrEmpty(state.LiveTvStreamId))
{
try
{
await LiveTvManager.CloseLiveStream(state.LiveTvStreamId, CancellationToken.None).ConfigureAwait(false);
}
catch (Exception ex)
{
Logger.ErrorException("Error closing live tv stream", ex);
}
}
}
/// <summary>
@@ -936,6 +948,8 @@ namespace MediaBrowser.Api.Playback
{
var streamInfo = await LiveTvManager.GetRecordingStream(request.Id, cancellationToken).ConfigureAwait(false);
state.LiveTvStreamId = streamInfo.Id;
if (!string.IsNullOrEmpty(streamInfo.Path) && File.Exists(streamInfo.Path))
{
state.MediaPath = streamInfo.Path;
@@ -961,6 +975,8 @@ namespace MediaBrowser.Api.Playback
var streamInfo = await LiveTvManager.GetChannelStream(request.Id, cancellationToken).ConfigureAwait(false);
state.LiveTvStreamId = streamInfo.Id;
if (!string.IsNullOrEmpty(streamInfo.Path) && File.Exists(streamInfo.Path))
{
state.MediaPath = streamInfo.Path;