diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-09-29 08:58:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-29 08:58:53 -0400 |
| commit | b474b56c27a1dd4d5b4be3f8f2bc2c924c9ddce3 (patch) | |
| tree | c9d7e2f702cf899fb50348772b54538135a3a4f9 /MediaBrowser.Api/Playback/BaseStreamingService.cs | |
| parent | 26fe7402688b49c1d730d39bdb0ffd971da7da34 (diff) | |
| parent | 76c7bfcb6795771cb06ef354fbf76d6e39de8948 (diff) | |
Merge pull request #2199 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Api/Playback/BaseStreamingService.cs')
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index fe9869664..8e57650b4 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -1861,14 +1861,14 @@ namespace MediaBrowser.Api.Playback MediaSourceInfo mediaSource = null; if (string.IsNullOrWhiteSpace(request.LiveStreamId)) { - //TranscodingJob currentJob = !string.IsNullOrWhiteSpace(request.PlaySessionId) ? - // ApiEntryPoint.Instance.GetTranscodingJob(request.PlaySessionId) - // : null; - - //if (currentJob != null) - //{ - // mediaSource = currentJob.MediaSource; - //} + TranscodingJob currentJob = !string.IsNullOrWhiteSpace(request.PlaySessionId) ? + ApiEntryPoint.Instance.GetTranscodingJob(request.PlaySessionId) + : null; + + if (currentJob != null) + { + mediaSource = currentJob.MediaSource; + } if (mediaSource == null) { |