update ILiveTvService

2 files changed, 23 insertions, 4 deletions

diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
index 9b36454d2a..0b58a92328 100644
--- a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
+++ b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
@@ -149,7 +149,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// <param name="id">The identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{Stream}.</returns>
-        Task<ChannelMediaInfo> GetRecordingStream(string id, CancellationToken cancellationToken);
+        Task<MediaSourceInfo> GetRecordingStream(string id, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets the channel stream.
@@ -157,7 +157,7 @@ namespace MediaBrowser.Controller.LiveTv
         /// <param name="id">The identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{StreamResponseInfo}.</returns>
-        Task<ChannelMediaInfo> GetChannelStream(string id, CancellationToken cancellationToken);
+        Task<MediaSourceInfo> GetChannelStream(string id, CancellationToken cancellationToken);
         
         /// <summary>
         /// Gets the program.
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvService.cs b/MediaBrowser.Controller/LiveTv/ILiveTvService.cs
index 993db00043..d7e3df4e23 100644
--- a/MediaBrowser.Controller/LiveTv/ILiveTvService.cs
+++ b/MediaBrowser.Controller/LiveTv/ILiveTvService.cs
@@ -4,6 +4,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Drawing;
+using MediaBrowser.Model.Dto;
 
 namespace MediaBrowser.Controller.LiveTv
 {
@@ -172,19 +173,37 @@ namespace MediaBrowser.Controller.LiveTv
         /// Gets the recording stream.
         /// </summary>
         /// <param name="recordingId">The recording identifier.</param>
+        /// <param name="streamId">The stream identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{Stream}.</returns>
-        Task<ChannelMediaInfo> GetRecordingStream(string recordingId, CancellationToken cancellationToken);
+        Task<MediaSourceInfo> GetRecordingStream(string recordingId, string streamId, CancellationToken cancellationToken);
 
         /// <summary>
         /// Gets the channel stream.
         /// </summary>
         /// <param name="channelId">The channel identifier.</param>
+        /// <param name="streamId">The stream identifier.</param>
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task{Stream}.</returns>
-        Task<ChannelMediaInfo> GetChannelStream(string channelId, CancellationToken cancellationToken);
+        Task<MediaSourceInfo> GetChannelStream(string channelId, string streamId, CancellationToken cancellationToken);
 
         /// <summary>
+        /// Gets the channel stream media sources.
+        /// </summary>
+        /// <param name="channelId">The channel identifier.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task&lt;List&lt;MediaSourceInfo&gt;&gt;.</returns>
+        Task<List<MediaSourceInfo>> GetChannelStreamMediaSources(string channelId, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Gets the recording stream media sources.
+        /// </summary>
+        /// <param name="recordingId">The recording identifier.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task&lt;List&lt;MediaSourceInfo&gt;&gt;.</returns>
+        Task<List<MediaSourceInfo>> GetRecordingStreamMediaSources(string recordingId, CancellationToken cancellationToken);
+        
+        /// <summary>
         /// Closes the live stream.
         /// </summary>
         /// <param name="id">The identifier.</param>