aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-03-29 15:16:43 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-03-29 15:16:43 -0400
commitf641c501a78d6270793ee9c9fa185517be6df008 (patch)
tree7c8d81191604d50b0ed71e07bbec0f6835d6250a /Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
parentcb5c9333c5f7bf318976b3790e727127ca481354 (diff)
improve cancellation support of auto-organize
Diffstat (limited to 'Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs')
-rw-r--r--Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs b/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
index 747e0fdd31..a9c449f837 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
@@ -104,7 +104,7 @@ namespace Emby.Server.Implementations.LiveTv
openKeys.Add(item.Id.ToString("N"));
openKeys.Add(source.Id ?? string.Empty);
source.OpenToken = string.Join(StreamIdDelimeterString, openKeys.ToArray());
- }
+ }
// Dummy this up so that direct play checks can still run
if (string.IsNullOrEmpty(source.Path) && source.Protocol == MediaProtocol.Http)
@@ -142,7 +142,7 @@ namespace Emby.Server.Implementations.LiveTv
{
if (!stream.SupportsProbing || stream.MediaStreams.Any(i => i.Index != -1))
{
- await AddMediaInfo(stream, isAudio, cancellationToken).ConfigureAwait(false);
+ AddMediaInfo(stream, isAudio, cancellationToken);
}
else
{
@@ -158,7 +158,7 @@ namespace Emby.Server.Implementations.LiveTv
return new Tuple<MediaSourceInfo, IDirectStreamProvider>(stream, directStreamProvider);
}
- private async Task AddMediaInfo(MediaSourceInfo mediaSource, bool isAudio, CancellationToken cancellationToken)
+ private void AddMediaInfo(MediaSourceInfo mediaSource, bool isAudio, CancellationToken cancellationToken)
{
mediaSource.DefaultSubtitleStreamIndex = null;