diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-04-17 15:01:16 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2017-04-17 15:01:16 -0400 |
| commit | 561028c90734b911ebb5eec26aa071fb6851a2a6 (patch) | |
| tree | 48a40e09ec701926d982f2979adefe94ba763448 /MediaBrowser.Controller | |
| parent | 0b5019ed1b8c7624eae27aebe715132e07f8a417 (diff) | |
update automated checkins
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Library/IMediaSourceManager.cs | 11 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Session/ISessionManager.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Session/SessionInfo.cs | 2 |
3 files changed, 4 insertions, 11 deletions
diff --git a/MediaBrowser.Controller/Library/IMediaSourceManager.cs b/MediaBrowser.Controller/Library/IMediaSourceManager.cs index 1ab0e4cb06..2f8f377896 100644 --- a/MediaBrowser.Controller/Library/IMediaSourceManager.cs +++ b/MediaBrowser.Controller/Library/IMediaSourceManager.cs @@ -68,10 +68,9 @@ namespace MediaBrowser.Controller.Library /// Opens the media source. /// </summary> /// <param name="request">The request.</param> - /// <param name="enableAutoClose">if set to <c>true</c> [enable automatic close].</param> /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task<MediaSourceInfo>.</returns> - Task<LiveStreamResponse> OpenLiveStream(LiveStreamRequest request, bool enableAutoClose, CancellationToken cancellationToken); + Task<LiveStreamResponse> OpenLiveStream(LiveStreamRequest request, CancellationToken cancellationToken); /// <summary> /// Gets the live stream. @@ -82,14 +81,6 @@ namespace MediaBrowser.Controller.Library Task<MediaSourceInfo> GetLiveStream(string id, CancellationToken cancellationToken); Task<Tuple<MediaSourceInfo, IDirectStreamProvider>> GetLiveStreamWithDirectStreamProvider(string id, CancellationToken cancellationToken); - - /// <summary> - /// Pings the media source. - /// </summary> - /// <param name="id">The live stream identifier.</param> - /// <param name="cancellationToken">The cancellation token.</param> - /// <returns>Task.</returns> - Task PingLiveStream(string id, CancellationToken cancellationToken); /// <summary> /// Closes the media source. diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs index 3871952450..956d4cc95f 100644 --- a/MediaBrowser.Controller/Session/ISessionManager.cs +++ b/MediaBrowser.Controller/Session/ISessionManager.cs @@ -99,6 +99,8 @@ namespace MediaBrowser.Controller.Session /// <exception cref="System.ArgumentNullException"></exception> Task OnPlaybackProgress(PlaybackProgressInfo info); + Task OnPlaybackProgress(PlaybackProgressInfo info, bool isAutomated); + /// <summary> /// Used to report that playback has ended for an item /// </summary> diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs index 6cb6f4bb69..4cb08de9fe 100644 --- a/MediaBrowser.Controller/Session/SessionInfo.cs +++ b/MediaBrowser.Controller/Session/SessionInfo.cs @@ -257,7 +257,7 @@ namespace MediaBrowser.Controller.Session try { - await _sessionManager.OnPlaybackProgress(progressInfo).ConfigureAwait(false); + await _sessionManager.OnPlaybackProgress(progressInfo, true).ConfigureAwait(false); } catch (Exception ex) { |