alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-08 03:12:08 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

update environment detection

Browse Source
This commit is contained in:
Luke Pulverenti
2017-04-29 02:22:33 -04:00
parent b220e221fa
commit f53472584e
32 changed files with 58 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Emby.Server.Implementations/Channels/ChannelManager.cs
View File

@@ -275,17 +275,7 @@ namespace Emby.Server.Implementations.Channels
public async Task<IEnumerable<MediaSourceInfo>> GetStaticMediaSources(BaseItem item, CancellationToken cancellationToken)
{
IEnumerable<ChannelMediaInfo> results = new List<ChannelMediaInfo>();
var video = item as Video;
if (video != null)
{
results = video.ChannelMediaSources;
}
var audio = item as Audio;
if (audio != null)
{
results = audio.ChannelMediaSources ?? GetSavedMediaSources(audio);
}
IEnumerable<ChannelMediaInfo> results = GetSavedMediaSources(item);
return SortMediaInfoResults(results)
.Select(i => GetMediaSource(item, i))
@@ -1378,7 +1368,6 @@ namespace Emby.Server.Implementations.Channels
if (channelVideoItem != null)
{
channelVideoItem.ExtraType = info.ExtraType;
channelVideoItem.ChannelMediaSources = info.MediaSources;
var mediaSource = info.MediaSources.FirstOrDefault();
item.Path = mediaSource == null ? null : mediaSource.Path;