diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-01-02 18:07:37 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-01-02 18:07:37 -0500 |
| commit | a5be2523c5d86c077175b2de347b8beb791616c1 (patch) | |
| tree | 5fbf58f4db3b51328fb55c86b330d01789418366 /MediaBrowser.Controller | |
| parent | b50fc351a12fa890b2d4ab6e71b7a4b609dd583c (diff) | |
added music and game genre image downloading
Diffstat (limited to 'MediaBrowser.Controller')
4 files changed, 23 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs index 87ac0d4dc..b7acb0735 100644 --- a/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs +++ b/MediaBrowser.Controller/LiveTv/ILiveTvManager.cs @@ -161,7 +161,7 @@ namespace MediaBrowser.Controller.LiveTv /// <param name="id">The identifier.</param> /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{Stream}.</returns> - Task<StreamResponseInfo> GetRecordingStream(string id, CancellationToken cancellationToken); + Task<LiveStreamInfo> GetRecordingStream(string id, CancellationToken cancellationToken); /// <summary> /// Gets the channel stream. @@ -169,7 +169,7 @@ namespace MediaBrowser.Controller.LiveTv /// <param name="id">The identifier.</param> /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{StreamResponseInfo}.</returns> - Task<StreamResponseInfo> GetChannelStream(string id, CancellationToken cancellationToken); + Task<LiveStreamInfo> GetChannelStream(string id, CancellationToken cancellationToken); /// <summary> /// Gets the program. diff --git a/MediaBrowser.Controller/LiveTv/ILiveTvService.cs b/MediaBrowser.Controller/LiveTv/ILiveTvService.cs index f8efbce63..491e8cbf8 100644 --- a/MediaBrowser.Controller/LiveTv/ILiveTvService.cs +++ b/MediaBrowser.Controller/LiveTv/ILiveTvService.cs @@ -145,7 +145,7 @@ namespace MediaBrowser.Controller.LiveTv /// <param name="recordingId">The recording identifier.</param> /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{Stream}.</returns> - Task<StreamResponseInfo> GetRecordingStream(string recordingId, CancellationToken cancellationToken); + Task<LiveStreamInfo> GetRecordingStream(string recordingId, CancellationToken cancellationToken); /// <summary> /// Gets the channel stream. @@ -153,6 +153,6 @@ namespace MediaBrowser.Controller.LiveTv /// <param name="channelId">The channel identifier.</param> /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{Stream}.</returns> - Task<StreamResponseInfo> GetChannelStream(string channelId, CancellationToken cancellationToken); + Task<LiveStreamInfo> GetChannelStream(string channelId, CancellationToken cancellationToken); } } diff --git a/MediaBrowser.Controller/LiveTv/LiveStreamInfo.cs b/MediaBrowser.Controller/LiveTv/LiveStreamInfo.cs new file mode 100644 index 000000000..ba480f685 --- /dev/null +++ b/MediaBrowser.Controller/LiveTv/LiveStreamInfo.cs @@ -0,0 +1,18 @@ + +namespace MediaBrowser.Controller.LiveTv +{ + public class LiveStreamInfo + { + /// <summary> + /// Gets or sets the path. + /// </summary> + /// <value>The path.</value> + public string Path { get; set; } + + /// <summary> + /// Gets or sets the URL. + /// </summary> + /// <value>The URL.</value> + public string Url { get; set; } + } +} diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 25ea9979c..e08361812 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -109,6 +109,7 @@ <Compile Include="Library\IUserDataManager.cs" /> <Compile Include="Library\UserDataSaveEventArgs.cs" /> <Compile Include="LiveTv\ILiveTvRecording.cs" /> + <Compile Include="LiveTv\LiveStreamInfo.cs" /> <Compile Include="LiveTv\LiveTvAudioRecording.cs" /> <Compile Include="LiveTv\LiveTvChannel.cs" /> <Compile Include="LiveTv\ChannelInfo.cs" /> |
