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

update recording

Browse Source
This commit is contained in:
Luke Pulverenti 2017-05-15 15:47:16 -04:00
parent 83c1503333
commit 7446d2803d
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View File

@ -1517,7 +1517,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
EnforceKeepUpTo(timer, seriesPath); EnforceKeepUpTo(timer, seriesPath);
}; };
await recorder.Record(mediaStreamInfo, recordPath, duration, onStarted, cancellationToken).ConfigureAwait(false); await recorder.Record(liveStreamInfo.Item1 as IDirectStreamProvider, mediaStreamInfo, recordPath, duration, onStarted, cancellationToken).ConfigureAwait(false);
recordingStatus = RecordingStatus.Completed; recordingStatus = RecordingStatus.Completed;
_logger.Info("Recording completed: {0}", recordPath); _logger.Info("Recording completed: {0}", recordPath);
@ -1759,17 +1759,27 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
{ {
var config = GetConfiguration(); var config = GetConfiguration();
if (config.EnableRecordingEncoding) var regInfo = await _liveTvManager.GetRegistrationInfo("embytvrecordingconversion").ConfigureAwait(false);
{
var regInfo = await _liveTvManager.GetRegistrationInfo("embytvrecordingconversion").ConfigureAwait(false);
if (regInfo.IsValid) if (regInfo.IsValid)
{
if (config.EnableRecordingEncoding)
{ {
return new EncodedRecorder(_logger, _fileSystem, _mediaEncoder, _config.ApplicationPaths, _jsonSerializer, config, _httpClient, _processFactory, _config); return new EncodedRecorder(_logger, _fileSystem, _mediaEncoder, _config.ApplicationPaths, _jsonSerializer, config, _httpClient, _processFactory, _config);
} }
return new DirectRecorder(_logger, _httpClient, _fileSystem);
//var options = new LiveTvOptions
//{
// EnableOriginalAudioWithEncodedRecordings = true,
// RecordedVideoCodec = "copy",
// RecordingEncodingFormat = "ts"
//};
//return new EncodedRecorder(_logger, _fileSystem, _mediaEncoder, _config.ApplicationPaths, _jsonSerializer, options, _httpClient, _processFactory, _config);
} }
return new DirectRecorder(_logger, _httpClient, _fileSystem); throw new InvalidOperationException("Emby DVR Requires an active Emby Premiere subscription.");
} }
private async void OnSuccessfulRecording(TimerInfo timer, string path) private async void OnSuccessfulRecording(TimerInfo timer, string path)