diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-11-17 16:54:33 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-11-17 16:54:33 -0500 |
| commit | 1dc8ff9e910c3bd34960a2b2e8f9b3e633c28620 (patch) | |
| tree | bf7a9b55f9592d209b8cd4e9128d9f6a013eb024 /Emby.Server.Implementations/LiveTv/EmbyTV | |
| parent | ceee0cdccabf2a0ce205b8c853d6a9c5f16b6a5c (diff) | |
allow specification of m3u stream limit
Diffstat (limited to 'Emby.Server.Implementations/LiveTv/EmbyTV')
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs index b469966f5c..9992c71ecf 100644 --- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs +++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs @@ -1052,10 +1052,27 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV { _liveStreamsSemaphore.Release(); } + } + + public async Task<List<ILiveStream>> GetLiveStreams(TunerHostInfo host, CancellationToken cancellationToken) + { + //await _liveStreamsSemaphore.WaitAsync(cancellationToken).ConfigureAwait(false); + + //try + //{ + var hostId = host.Id; + return _liveStreams + .Where(i => string.Equals(i.TunerHostId, hostId, StringComparison.OrdinalIgnoreCase)) + .ToList(); + //} + //finally + //{ + // _liveStreamsSemaphore.Release(); + //} } - private async Task<Tuple<ILiveStream, MediaSourceInfo, ITunerHost>> GetChannelStreamInternal(string channelId, string streamId, CancellationToken cancellationToken) + private async Task<Tuple<ILiveStream, MediaSourceInfo>> GetChannelStreamInternal(string channelId, string streamId, CancellationToken cancellationToken) { _logger.Info("Streaming Channel " + channelId); @@ -1072,7 +1089,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV _logger.Info("Live stream {0} consumer count is now {1}", streamId, result.ConsumerCount); - return new Tuple<ILiveStream, MediaSourceInfo, ITunerHost>(result, openedMediaSource, result.TunerHost); + return new Tuple<ILiveStream, MediaSourceInfo>(result, openedMediaSource); } foreach (var hostInstance in _liveTvManager.TunerHosts) @@ -1086,13 +1103,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV result.SharedStreamIds.Add(openedMediaSource.Id); _liveStreams.Add(result); - result.TunerHost = hostInstance; result.OriginalStreamId = streamId; _logger.Info("Returning mediasource streamId {0}, mediaSource.Id {1}, mediaSource.LiveStreamId {2}", streamId, openedMediaSource.Id, openedMediaSource.LiveStreamId); - return new Tuple<ILiveStream, MediaSourceInfo, ITunerHost>(result, openedMediaSource, hostInstance); + return new Tuple<ILiveStream, MediaSourceInfo>(result, openedMediaSource); } catch (FileNotFoundException) { |
