From b9cacd8076c00bfc371898c50315304927efaff8 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Wed, 5 Oct 2016 03:15:29 -0400
Subject: update live streams

---
 .../Library/MediaSourceManager.cs                     | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs')

diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
index ae32bdaf7..e7bfe56f2 100644
--- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -367,7 +367,9 @@ namespace MediaBrowser.Server.Implementations.Library
                 var tuple = GetProvider(request.OpenToken);
                 var provider = tuple.Item1;
 
-                var mediaSource = await provider.OpenMediaSource(tuple.Item2, cancellationToken).ConfigureAwait(false);
+                var mediaSourceTuple = await provider.OpenMediaSource(tuple.Item2, cancellationToken).ConfigureAwait(false);
+
+                var mediaSource = mediaSourceTuple.Item1;
 
                 if (string.IsNullOrWhiteSpace(mediaSource.LiveStreamId))
                 {
@@ -381,8 +383,10 @@ namespace MediaBrowser.Server.Implementations.Library
                     Date = DateTime.UtcNow,
                     EnableCloseTimer = enableAutoClose,
                     Id = mediaSource.LiveStreamId,
-                    MediaSource = mediaSource
+                    MediaSource = mediaSource,
+                    DirectStreamProvider = mediaSourceTuple.Item2
                 };
+
                 _openStreams[mediaSource.LiveStreamId] = info;
 
                 if (enableAutoClose)
@@ -414,7 +418,7 @@ namespace MediaBrowser.Server.Implementations.Library
             }
         }
 
-        public async Task<MediaSourceInfo> GetLiveStream(string id, CancellationToken cancellationToken)
+        public async Task<Tuple<MediaSourceInfo, IDirectStreamProvider>> GetLiveStreamWithDirectStreamProvider(string id, CancellationToken cancellationToken)
         {
             if (string.IsNullOrWhiteSpace(id))
             {
@@ -430,7 +434,7 @@ namespace MediaBrowser.Server.Implementations.Library
                 LiveStreamInfo info;
                 if (_openStreams.TryGetValue(id, out info))
                 {
-                    return info.MediaSource;
+                    return new Tuple<MediaSourceInfo, IDirectStreamProvider>(info.MediaSource, info.DirectStreamProvider);
                 }
                 else
                 {
@@ -443,6 +447,12 @@ namespace MediaBrowser.Server.Implementations.Library
             }
         }
 
+        public async Task<MediaSourceInfo> GetLiveStream(string id, CancellationToken cancellationToken)
+        {
+            var result = await GetLiveStreamWithDirectStreamProvider(id, cancellationToken).ConfigureAwait(false);
+            return result.Item1;
+        }
+
         public async Task PingLiveStream(string id, CancellationToken cancellationToken)
         {
             await _liveStreamSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false);
@@ -630,6 +640,7 @@ namespace MediaBrowser.Server.Implementations.Library
             public string Id;
             public bool Closed;
             public MediaSourceInfo MediaSource;
+            public IDirectStreamProvider DirectStreamProvider;
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.2.3