diff options
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/LiveTv/ILiveTvManager.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/ItemInfo.cs | 23 |
2 files changed, 24 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs index 4ee0565f9..53eb18e7a 100644 --- a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs +++ b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs @@ -158,9 +158,10 @@ namespace MediaBrowser.Controller.LiveTv /// Gets the channel stream. /// </summary> /// <param name="id">The identifier.</param> + /// <param name="mediaSourceId">The media source identifier.</param> /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{StreamResponseInfo}.</returns> - Task<MediaSourceInfo> GetChannelStream(string id, CancellationToken cancellationToken); + Task<MediaSourceInfo> GetChannelStream(string id, string mediaSourceId, CancellationToken cancellationToken); /// <summary> /// Gets the program. diff --git a/MediaBrowser.Controller/Providers/ItemInfo.cs b/MediaBrowser.Controller/Providers/ItemInfo.cs index 113a7bb8e..78f352057 100644 --- a/MediaBrowser.Controller/Providers/ItemInfo.cs +++ b/MediaBrowser.Controller/Providers/ItemInfo.cs @@ -1,9 +1,30 @@ +using MediaBrowser.Controller.Entities; +using MediaBrowser.Model.Entities; + namespace MediaBrowser.Controller.Providers { public class ItemInfo { - public string Path { get; set; } + public ItemInfo() + { + } + + public ItemInfo(IHasMetadata item) + { + Path = item.Path; + ContainingFolderPath = item.ContainingFolderPath; + IsInMixedFolder = item.IsInMixedFolder; + var video = item as Video; + if (video != null) + { + VideoType = video.VideoType; + } + } + + public string Path { get; set; } + public string ContainingFolderPath { get; set; } + public VideoType VideoType { get; set; } public bool IsInMixedFolder { get; set; } } }
\ No newline at end of file |