alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-22 10:06:40 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

allow channel items in collections and playlists

Browse Source
This commit is contained in:
Luke Pulverenti
2016-10-01 16:29:24 -04:00
parent 8589689f65
commit 951e2b6de3
4 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@@ -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))
{

3
MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunLiveStream.cs
View File

@@ -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);