alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-16 11:13:32 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Rename 'track' into 'item' in SyncPlay

Browse Source
This commit is contained in:
Ionut Andrei Oanca
2020-12-03 15:41:34 +01:00
parent 7e0ea296c3
commit 389367fec8
13 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs
View File

@@ -157,13 +157,13 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
}
/// <inheritdoc />
public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
{
UnhandledRequest(request);
}
/// <inheritdoc />
public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
public virtual void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
{
UnhandledRequest(request);
}

4
MediaBrowser.Controller/SyncPlay/GroupStates/IdleGroupState.cs
View File

@@ -93,7 +93,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
}
/// <inheritdoc />
public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
{
// Change state.
var waitingState = new WaitingGroupState(LoggerFactory);
@@ -102,7 +102,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
}
/// <inheritdoc />
public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
{
// Change state.
var waitingState = new WaitingGroupState(LoggerFactory);

4
MediaBrowser.Controller/SyncPlay/GroupStates/PausedGroupState.cs
View File

@@ -145,7 +145,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
}
/// <inheritdoc />
public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
{
// Change state.
var waitingState = new WaitingGroupState(LoggerFactory);
@@ -154,7 +154,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
}
/// <inheritdoc />
public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
{
// Change state.
var waitingState = new WaitingGroupState(LoggerFactory);

4
MediaBrowser.Controller/SyncPlay/GroupStates/PlayingGroupState.cs
View File

@@ -148,7 +148,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
}
/// <inheritdoc />
public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
{
// Change state.
var waitingState = new WaitingGroupState(LoggerFactory);
@@ -157,7 +157,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
}
/// <inheritdoc />
public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
{
// Change state.
var waitingState = new WaitingGroupState(LoggerFactory);

12
MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs
View File

@@ -560,7 +560,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
}
/// <inheritdoc />
public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
{
// Save state if first event.
if (!InitialStateSet)
@@ -582,7 +582,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
if (newItem)
{
// Send playing-queue update.
var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.NextTrack);
var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.NextItem);
var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
@@ -601,12 +601,12 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
context.SetState(newState);
_logger.LogDebug("No next track available in group {GroupId}.", context.GroupId.ToString());
_logger.LogDebug("No next item available in group {GroupId}.", context.GroupId.ToString());
}
}
/// <inheritdoc />
public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
public override void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken)
{
// Save state if first event.
if (!InitialStateSet)
@@ -628,7 +628,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
if (newItem)
{
// Send playing-queue update.
var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.PreviousTrack);
var playQueueUpdate = context.GetPlayQueueUpdate(PlayQueueUpdateReason.PreviousItem);
var update = context.NewSyncPlayGroupUpdate(GroupUpdateType.PlayQueue, playQueueUpdate);
context.SendGroupUpdate(session, SyncPlayBroadcastType.AllGroup, update, cancellationToken);
@@ -647,7 +647,7 @@ namespace MediaBrowser.Controller.SyncPlay.GroupStates
context.SetState(newState);
_logger.LogDebug("No previous track available in group {GroupId}.", context.GroupId.ToString());
_logger.LogDebug("No previous item available in group {GroupId}.", context.GroupId.ToString());
}
}

12
MediaBrowser.Controller/SyncPlay/IGroupState.cs
View File

@@ -155,24 +155,24 @@ namespace MediaBrowser.Controller.SyncPlay
void HandleRequest(IGroupStateContext context, GroupStateType prevState, ReadyGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
/// <summary>
/// Handles a next-track request from a session. Context's state can change.
/// Handles a next-item request from a session. Context's state can change.
/// </summary>
/// <param name="context">The context of the state.</param>
/// <param name="prevState">The previous state.</param>
/// <param name="request">The next-track request.</param>
/// <param name="request">The next-item request.</param>
/// <param name="session">The session.</param>
/// <param name="cancellationToken">The cancellation token.</param>
void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
void HandleRequest(IGroupStateContext context, GroupStateType prevState, NextItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
/// <summary>
/// Handles a previous-track request from a session. Context's state can change.
/// Handles a previous-item request from a session. Context's state can change.
/// </summary>
/// <param name="context">The context of the state.</param>
/// <param name="prevState">The previous state.</param>
/// <param name="request">The previous-track request.</param>
/// <param name="request">The previous-item request.</param>
/// <param name="session">The session.</param>
/// <param name="cancellationToken">The cancellation token.</param>
void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousTrackGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
void HandleRequest(IGroupStateContext context, GroupStateType prevState, PreviousItemGroupRequest request, SessionInfo session, CancellationToken cancellationToken);
/// <summary>
/// Handles a set-repeat-mode request from a session. Context's state should not change.

10
MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs → MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextItemGroupRequest.cs
View File

@@ -5,15 +5,15 @@ using MediaBrowser.Model.SyncPlay;
namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
{
/// <summary>
/// Class NextTrackGroupRequest.
/// Class NextItemGroupRequest.
/// </summary>
public class NextTrackGroupRequest : AbstractPlaybackRequest
public class NextItemGroupRequest : AbstractPlaybackRequest
{
/// <summary>
/// Initializes a new instance of the <see cref="NextTrackGroupRequest"/> class.
/// Initializes a new instance of the <see cref="NextItemGroupRequest"/> class.
/// </summary>
/// <param name="playlistItemId">The playing item identifier.</param>
public NextTrackGroupRequest(string playlistItemId)
public NextItemGroupRequest(string playlistItemId)
{
PlaylistItemId = playlistItemId;
}
@@ -25,7 +25,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
public string PlaylistItemId { get; }
/// <inheritdoc />
public override PlaybackRequestType Action { get; } = PlaybackRequestType.NextTrack;
public override PlaybackRequestType Action { get; } = PlaybackRequestType.NextItem;
/// <inheritdoc />
public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)

10
MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs → MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousItemGroupRequest.cs
View File

@@ -5,15 +5,15 @@ using MediaBrowser.Model.SyncPlay;
namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
{
/// <summary>
/// Class PreviousTrackGroupRequest.
/// Class PreviousItemGroupRequest.
/// </summary>
public class PreviousTrackGroupRequest : AbstractPlaybackRequest
public class PreviousItemGroupRequest : AbstractPlaybackRequest
{
/// <summary>
/// Initializes a new instance of the <see cref="PreviousTrackGroupRequest"/> class.
/// Initializes a new instance of the <see cref="PreviousItemGroupRequest"/> class.
/// </summary>
/// <param name="playlistItemId">The playing item identifier.</param>
public PreviousTrackGroupRequest(string playlistItemId)
public PreviousItemGroupRequest(string playlistItemId)
{
PlaylistItemId = playlistItemId;
}
@@ -25,7 +25,7 @@ namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
public string PlaylistItemId { get; }
/// <inheritdoc />
public override PlaybackRequestType Action { get; } = PlaybackRequestType.PreviousTrack;
public override PlaybackRequestType Action { get; } = PlaybackRequestType.PreviousItem;
/// <inheritdoc />
public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)