alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-19 00:26:25 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

live tv updates

Browse Source
This commit is contained in:
Luke Pulverenti
2014-01-13 00:41:00 -05:00
parent e4f5a3f005
commit fdca3bd9c4
10 changed files with 80 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
View File

@@ -161,7 +161,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
return null;
}
return val.Value * 2;
return val.Value;
}
public string GetStatusName(RecordingStatus status)
@@ -222,6 +222,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
IsPremiere = info.IsPremiere,
RunTimeTicks = (info.EndDate - info.StartDate).Ticks,
LocationType = recording.LocationType,
OriginalAirDate = info.OriginalAirDate,
MediaStreams = _itemRepo.GetMediaStreams(new MediaStreamQuery
{

6
MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
View File

@@ -249,11 +249,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
{
process.Kill();
}
catch (InvalidOperationException ex1)
{
_logger.ErrorException("Error killing ffprobe", ex1);
}
catch (Win32Exception ex1)
catch (Exception ex1)
{
_logger.ErrorException("Error killing ffprobe", ex1);
}