alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-19 04:34:18 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

update automated checkins

Browse Source
This commit is contained in:
Luke Pulverenti
2017-04-17 15:01:16 -04:00
parent 0b5019ed1b
commit 561028c907
12 changed files with 28 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
MediaBrowser.Controller/Library/IMediaSourceManager.cs
View File

@@ -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&lt;MediaSourceInfo&gt;.</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.

2
MediaBrowser.Controller/Session/ISessionManager.cs
View File

@@ -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>

2
MediaBrowser.Controller/Session/SessionInfo.cs
View File

@@ -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)
{