diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-10-01 16:31:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-01 16:31:15 -0400 |
| commit | ad11413824bb02ece1692a0b1bda9c984216fdfc (patch) | |
| tree | fa8679a77531890b58d750ca4d225679b1662ed6 /MediaBrowser.Server.Implementations | |
| parent | 073affa687268ccfd4d3fa64a12d145c735cf058 (diff) | |
| parent | 951e2b6de30631e8b30c9290fc9e0cb5eea5ea2e (diff) | |
Merge pull request #2206 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations')
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunLiveStream.cs | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs index 025f5a162..e34868428 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs @@ -566,10 +566,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv } var seriesId = info.SeriesId; - if (string.IsNullOrWhiteSpace(seriesId) && info.IsSeries) - { - seriesId = info.Name.GetMD5().ToString("N"); - } if (!item.ParentId.Equals(channel.Id)) { diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunLiveStream.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunLiveStream.cs index 57722881d..2cdd0571b 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunLiveStream.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunLiveStream.cs @@ -58,6 +58,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun OpenedMediaSource.Path = _appHost.GetLocalApiUrl("localhost") + "/LiveTv/LiveStreamFiles/" + Path.GetFileNameWithoutExtension(tempFile) + "/stream.ts"; OpenedMediaSource.Protocol = MediaProtocol.Http; + OpenedMediaSource.SupportsDirectPlay = false; + OpenedMediaSource.SupportsDirectStream = true; + OpenedMediaSource.SupportsTranscoding = true; await taskCompletionSource.Task.ConfigureAwait(false); |