From 10b9a865b7baed2fb83ec7a71e0524ffe80ea609 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 29 Mar 2015 14:31:28 -0400 Subject: update live stream handling --- MediaBrowser.Api/ApiEntryPoint.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'MediaBrowser.Api/ApiEntryPoint.cs') diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs index 9f4ad5893..444977e35 100644 --- a/MediaBrowser.Api/ApiEntryPoint.cs +++ b/MediaBrowser.Api/ApiEntryPoint.cs @@ -132,7 +132,7 @@ namespace MediaBrowser.Api /// Called when [transcode beginning]. /// /// The path. - /// The stream identifier. + /// The play session identifier. /// The transcoding job identifier. /// The type. /// The process. @@ -141,7 +141,7 @@ namespace MediaBrowser.Api /// The cancellation token source. /// TranscodingJob. public TranscodingJob OnTranscodeBeginning(string path, - string streamId, + string playSessionId, string transcodingJobId, TranscodingJobType type, Process process, @@ -160,7 +160,7 @@ namespace MediaBrowser.Api DeviceId = deviceId, CancellationTokenSource = cancellationTokenSource, Id = transcodingJobId, - StreamId = streamId + PlaySessionId = playSessionId }; _activeTranscodingJobs.Add(job); @@ -324,10 +324,10 @@ namespace MediaBrowser.Api /// Kills the single transcoding job. /// /// The device id. - /// The stream identifier. + /// The play session identifier. /// The delete files. /// Task. - internal void KillTranscodingJobs(string deviceId, string streamId, Func deleteFiles) + internal void KillTranscodingJobs(string deviceId, string playSessionId, Func deleteFiles) { if (string.IsNullOrEmpty(deviceId)) { @@ -338,7 +338,7 @@ namespace MediaBrowser.Api { if (string.Equals(deviceId, j.DeviceId, StringComparison.OrdinalIgnoreCase)) { - return string.IsNullOrWhiteSpace(streamId) || string.Equals(streamId, j.StreamId, StringComparison.OrdinalIgnoreCase); + return string.IsNullOrWhiteSpace(playSessionId) || string.Equals(playSessionId, j.PlaySessionId, StringComparison.OrdinalIgnoreCase); } return false; @@ -539,10 +539,10 @@ namespace MediaBrowser.Api public class TranscodingJob { /// - /// Gets or sets the stream identifier. + /// Gets or sets the play session identifier. /// - /// The stream identifier. - public string StreamId { get; set; } + /// The play session identifier. + public string PlaySessionId { get; set; } /// /// Gets or sets the path. /// -- cgit v1.2.3