alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-06 15:58:29 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Address requested changes by review

Browse Source
This commit is contained in:
Ionut Andrei Oanca
2020-10-22 15:51:58 +02:00
parent 1cabe82b59
commit 0c735a0395
7 changed files with 54 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/SyncPlay/GroupStates/AbstractGroupState.cs
View File

@@ -212,7 +212,7 @@ namespace MediaBrowser.Controller.SyncPlay
private void UnhandledRequest(IPlaybackGroupRequest request)
{
_logger.LogWarning("HandleRequest: unhandled {0} request for {1} state.", request.GetRequestType(), this.GetGroupState());
_logger.LogWarning("HandleRequest: unhandled {0} request for {1} state.", request.GetRequestType(), GetGroupState());
}
}
}

3
Emby.Server.Implementations/SyncPlay/GroupStates/IdleGroupState.cs
View File

@@ -16,7 +16,8 @@ namespace MediaBrowser.Controller.SyncPlay
/// <summary>
/// Default constructor.
/// </summary>
public IdleGroupState(ILogger logger) : base(logger)
public IdleGroupState(ILogger logger)
: base(logger)
{
// Do nothing.
}

9
Emby.Server.Implementations/SyncPlay/GroupStates/PausedGroupState.cs
View File

@@ -17,7 +17,8 @@ namespace MediaBrowser.Controller.SyncPlay
/// <summary>
/// Default constructor.
/// </summary>
public PausedGroupState(ILogger logger) : base(logger)
public PausedGroupState(ILogger logger)
: base(logger)
{
// Do nothing.
}
@@ -70,8 +71,12 @@ namespace MediaBrowser.Controller.SyncPlay
var currentTime = DateTime.UtcNow;
var elapsedTime = currentTime - context.LastActivity;
context.LastActivity = currentTime;
// Elapsed time is negative if event happens
// during the delay added to account for latency.
// In this phase clients haven't started the playback yet.
// In other words, LastActivity is in the future,
// when playback unpause is supposed to happen.
// Seek only if playback actually started.
// Pause request may be issued during the delay added to account for latency.
context.PositionTicks += Math.Max(elapsedTime.Ticks, 0);
var command = context.NewSyncPlayCommand(SendCommandType.Pause);

3
Emby.Server.Implementations/SyncPlay/GroupStates/PlayingGroupState.cs
View File

@@ -22,7 +22,8 @@ namespace MediaBrowser.Controller.SyncPlay
/// <summary>
/// Default constructor.
/// </summary>
public PlayingGroupState(ILogger logger) : base(logger)
public PlayingGroupState(ILogger logger)
: base(logger)
{
// Do nothing.
}

17
Emby.Server.Implementations/SyncPlay/GroupStates/WaitingGroupState.cs
View File

@@ -32,7 +32,8 @@ namespace MediaBrowser.Controller.SyncPlay
/// <summary>
/// Default constructor.
/// </summary>
public WaitingGroupState(ILogger logger) : base(logger)
public WaitingGroupState(ILogger logger)
: base(logger)
{
// Do nothing.
}
@@ -59,8 +60,12 @@ namespace MediaBrowser.Controller.SyncPlay
var currentTime = DateTime.UtcNow;
var elapsedTime = currentTime - context.LastActivity;
context.LastActivity = currentTime;
// Elapsed time is negative if event happens
// during the delay added to account for latency.
// In this phase clients haven't started the playback yet.
// In other words, LastActivity is in the future,
// when playback unpause is supposed to happen.
// Seek only if playback actually started.
// Event may happen during the delay added to account for latency.
context.PositionTicks += Math.Max(elapsedTime.Ticks, 0);
}
@@ -355,6 +360,12 @@ namespace MediaBrowser.Controller.SyncPlay
var currentTime = DateTime.UtcNow;
var elapsedTime = currentTime - context.LastActivity;
context.LastActivity = currentTime;
// Elapsed time is negative if event happens
// during the delay added to account for latency.
// In this phase clients haven't started the playback yet.
// In other words, LastActivity is in the future,
// when playback unpause is supposed to happen.
// Seek only if playback actually started.
context.PositionTicks += Math.Max(elapsedTime.Ticks, 0);
// Send pause command to all non-buffering sessions.
@@ -484,7 +495,7 @@ namespace MediaBrowser.Controller.SyncPlay
{
// Client, that was buffering, resumed playback but did not update others in time.
delayTicks = context.GetHighestPing() * 2 * TimeSpan.TicksPerMillisecond;
delayTicks = delayTicks < context.DefaultPing ? context.DefaultPing : delayTicks;
delayTicks = Math.Max(delayTicks, context.DefaultPing);
context.LastActivity = currentTime.AddTicks(delayTicks);