aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/LiveTv
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2015-05-26 16:06:31 -0400
committerLuke <luke.pulverenti@gmail.com>2015-05-26 16:06:31 -0400
commit8bd7055d1738f22e9f52cd80a79e7a4ac23d61ff (patch)
tree185830059da50b6c43f13ca528fe981c1266808f /MediaBrowser.Controller/LiveTv
parenta3d796cd54c809c7ec2783e5cab6c37b2950410d (diff)
parentb666c627c8def4d1236090372bd6795fec940979 (diff)
Merge pull request #1109 from MediaBrowser/dev
3.0.5621.3
Diffstat (limited to 'MediaBrowser.Controller/LiveTv')
-rw-r--r--MediaBrowser.Controller/LiveTv/ILiveTvManager.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs
index 4ee0565f9b..53eb18e7a8 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.