diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-02-18 22:46:09 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-02-18 22:46:09 -0500 |
| commit | 0ee1a0d7bd827e53351ee5e4ad21c4dda258362d (patch) | |
| tree | d3dd05b49062854a724253863901327d036aae04 /MediaBrowser.Api/Playback | |
| parent | 00760f7d24776d101aa44302025d37df9b12b2d3 (diff) | |
fix mapping multiple tuner channels to same epg channel
Diffstat (limited to 'MediaBrowser.Api/Playback')
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Api/Playback/StreamState.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Api/Playback/UniversalAudioService.cs | 8 |
3 files changed, 5 insertions, 6 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index e561b3f467..e1559cabf9 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -22,7 +22,6 @@ using System.Threading.Tasks; using MediaBrowser.Common.Net; using MediaBrowser.Controller; using MediaBrowser.Controller.Net; -using MediaBrowser.MediaEncoding.Encoder; using MediaBrowser.Model.Diagnostics; namespace MediaBrowser.Api.Playback diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs index 4fb936340e..912d60889d 100644 --- a/MediaBrowser.Api/Playback/StreamState.cs +++ b/MediaBrowser.Api/Playback/StreamState.cs @@ -13,7 +13,7 @@ using System.Globalization; using System.IO; using System.Linq; using System.Threading; -using MediaBrowser.MediaEncoding.Encoder; +using MediaBrowser.Controller.MediaEncoding; namespace MediaBrowser.Api.Playback { diff --git a/MediaBrowser.Api/Playback/UniversalAudioService.cs b/MediaBrowser.Api/Playback/UniversalAudioService.cs index a52ae1df4c..e50d0f2c54 100644 --- a/MediaBrowser.Api/Playback/UniversalAudioService.cs +++ b/MediaBrowser.Api/Playback/UniversalAudioService.cs @@ -199,9 +199,9 @@ namespace MediaBrowser.Api.Playback if (isHeadRequest) { - return service.Head(newRequest); + return await service.Head(newRequest).ConfigureAwait(false); } - return service.Get(newRequest); + return await service.Get(newRequest).ConfigureAwait(false); } else { @@ -239,9 +239,9 @@ namespace MediaBrowser.Api.Playback if (isHeadRequest) { - return service.Head(newRequest); + return await service.Head(newRequest).ConfigureAwait(false); } - return service.Get(newRequest); + return await service.Get(newRequest).ConfigureAwait(false); } } } |