starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-24 09:44:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove ChannelAudioItem

Browse Source
This commit is contained in:
Luke Pulverenti
2016-03-19 01:14:47 -04:00
parent 7b93b7a33c
commit f0c947851d
9 changed files with 48 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
View File

@@ -257,10 +257,10 @@ namespace MediaBrowser.Server.Implementations.Channels
{
results = video.ChannelMediaSources;
}
var audio = item as ChannelAudioItem;
var audio = item as Audio;
if (audio != null)
{
results = audio.ChannelMediaSources;
results = audio.ChannelMediaSources ?? new List<ChannelMediaInfo>();
}
var sources = SortMediaInfoResults(results)
@@ -1259,7 +1259,7 @@ namespace MediaBrowser.Server.Implementations.Channels
}
else if (info.MediaType == ChannelMediaType.Audio)
{
item = GetItemById<ChannelAudioItem>(info.Id, channelProvider.Name, channelProvider.DataVersion, out isNew);
item = GetItemById<Audio>(info.Id, channelProvider.Name, channelProvider.DataVersion, out isNew);
}
else
{
@@ -1299,10 +1299,9 @@ namespace MediaBrowser.Server.Implementations.Channels
}
item.ExternalId = info.Id;
var channelAudioItem = item as ChannelAudioItem;
var channelAudioItem = item as Audio;
if (channelAudioItem != null)
{
channelAudioItem.ContentType = info.ContentType;
channelAudioItem.ExtraType = info.ExtraType;
channelAudioItem.ChannelMediaSources = info.MediaSources;