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

remove IChannelItem interface

Browse Source
This commit is contained in:
Luke Pulverenti
2016-03-19 00:05:33 -04:00
parent bd06308f2c
commit 9e495d3886
14 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/Channels/ChannelFolderItem.cs
View File

@@ -11,7 +11,7 @@ using MediaBrowser.Model.Entities;
namespace MediaBrowser.Controller.Channels
{
public class ChannelFolderItem : Folder, IChannelItem
public class ChannelFolderItem : Folder
{
public ChannelFolderType ChannelFolderType { get; set; }

4
MediaBrowser.Controller/Channels/ChannelVideoItem.cs
View File

@@ -132,9 +132,9 @@ namespace MediaBrowser.Controller.Channels
return IsVisibleStandaloneInternal(user, false) && IsChannelVisible(this, user);
}
internal static bool IsChannelVisible(IChannelItem item, User user)
internal static bool IsChannelVisible(BaseItem channelItem, User user)
{
var channel = ChannelManager.GetChannel(item.ChannelId);
var channel = ChannelManager.GetChannel(channelItem.ChannelId);
return channel.IsVisible(user);
}

11
MediaBrowser.Controller/Channels/IChannelItem.cs
View File

@@ -1,11 +0,0 @@
using MediaBrowser.Controller.Entities;
namespace MediaBrowser.Controller.Channels
{
public interface IChannelItem : IHasImages, IHasTags
{
string ChannelId { get; set; }
string ExternalId { get; set; }
}
}

9
MediaBrowser.Controller/Channels/IChannelMediaItem.cs
View File

@@ -1,11 +1,16 @@
using MediaBrowser.Model.Channels;
using System;
using MediaBrowser.Model.Channels;
using MediaBrowser.Model.Entities;
using System.Collections.Generic;
namespace MediaBrowser.Controller.Channels
{
public interface IChannelMediaItem : IChannelItem
public interface IChannelMediaItem
{
string ChannelId { get; set; }
Guid Id { get; set; }
string ExternalId { get; set; }
long? RunTimeTicks { get; set; }
string MediaType { get; }

3
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -169,6 +169,9 @@ namespace MediaBrowser.Controller.Entities
[IgnoreDataMember]
public bool IsOffline { get; set; }
[IgnoreDataMember]
public SourceType SourceType { get; set; }
/// <summary>
/// Returns the folder containing the item.
/// If the item is a folder, it returns the folder itself

10
MediaBrowser.Controller/Entities/SourceType.cs Normal file
View File

@@ -0,0 +1,10 @@

namespace MediaBrowser.Controller.Entities
{
public enum SourceType
{
Library = 0,
Channel = 1,
LiveTV = 2
}
}

2
MediaBrowser.Controller/MediaBrowser.Controller.csproj
View File

@@ -84,7 +84,6 @@
<Compile Include="Channels\ChannelSearchInfo.cs" />
<Compile Include="Channels\IChannel.cs" />
<Compile Include="Channels\IChannelManager.cs" />
<Compile Include="Channels\IChannelItem.cs" />
<Compile Include="Channels\ChannelAudioItem.cs" />
<Compile Include="Channels\ChannelVideoItem.cs" />
<Compile Include="Channels\Channel.cs" />
@@ -180,6 +179,7 @@
<Compile Include="Entities\Photo.cs" />
<Compile Include="Entities\PhotoAlbum.cs" />
<Compile Include="Entities\Share.cs" />
<Compile Include="Entities\SourceType.cs" />
<Compile Include="Entities\UserView.cs" />
<Compile Include="Entities\UserViewBuilder.cs" />
<Compile Include="FileOrganization\IFileOrganizationService.cs" />