diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-01-13 00:41:00 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-01-13 00:41:00 -0500 |
| commit | fdca3bd9c407aab9b22b6d09b6f393fa49be4f3d (patch) | |
| tree | 766ade1e6bc8696157f6804cf529b68355eff16b /MediaBrowser.Server.Implementations | |
| parent | e4f5a3f005a240b013194d6a54edce29fef91e11 (diff) | |
live tv updates
Diffstat (limited to 'MediaBrowser.Server.Implementations')
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs index c042e7750..ad9f769eb 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs @@ -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 { diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs index 6f956ba20..b09ff623e 100644 --- a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs +++ b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs @@ -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); } |