diff options
| author | Ionut Andrei Oanca <oancaionutandrei@gmail.com> | 2020-12-03 15:41:34 +0100 |
|---|---|---|
| committer | Ionut Andrei Oanca <oancaionutandrei@gmail.com> | 2020-12-03 15:54:39 +0100 |
| commit | 389367fec80561548c6d0771242712f675f95319 (patch) | |
| tree | 43b5600f658f0e7a61c2c6e6870789eb1ff08f5f /MediaBrowser.Controller | |
| parent | 7e0ea296c383b9b9cd778bb12834c2a73df3d1ea (diff) | |
Rename 'track' into 'item' in SyncPlay
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Controller/SyncPlay/GroupStates/IdleGroupState.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Controller/SyncPlay/GroupStates/PausedGroupState.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Controller/SyncPlay/GroupStates/PlayingGroupState.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.Controller/SyncPlay/IGroupState.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextItemGroupRequest.cs (renamed from MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs) | 10 | ||||
| -rw-r--r-- | MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousItemGroupRequest.cs (renamed from MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs) | 10 |
8 files changed, 30 insertions, 30 deletions
diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs index 0b15e3ae4a..5e3d4a2528 100644 --- a/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs +++ b/MediaBrowser.Controller/SyncPlay/GroupStates/AbstractGroupState.cs @@ -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); } diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/IdleGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/IdleGroupState.cs index 7730a298c2..8074d5a96b 100644 --- a/MediaBrowser.Controller/SyncPlay/GroupStates/IdleGroupState.cs +++ b/MediaBrowser.Controller/SyncPlay/GroupStates/IdleGroupState.cs @@ -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); diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/PausedGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/PausedGroupState.cs index 90411f61bc..28e5db950d 100644 --- a/MediaBrowser.Controller/SyncPlay/GroupStates/PausedGroupState.cs +++ b/MediaBrowser.Controller/SyncPlay/GroupStates/PausedGroupState.cs @@ -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); diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/PlayingGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/PlayingGroupState.cs index aab87d9c39..278a0af084 100644 --- a/MediaBrowser.Controller/SyncPlay/GroupStates/PlayingGroupState.cs +++ b/MediaBrowser.Controller/SyncPlay/GroupStates/PlayingGroupState.cs @@ -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); diff --git a/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs b/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs index fefb8067fe..f5f603c296 100644 --- a/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs +++ b/MediaBrowser.Controller/SyncPlay/GroupStates/WaitingGroupState.cs @@ -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()); } } diff --git a/MediaBrowser.Controller/SyncPlay/IGroupState.cs b/MediaBrowser.Controller/SyncPlay/IGroupState.cs index 0028823b4e..89a8e2e2e7 100644 --- a/MediaBrowser.Controller/SyncPlay/IGroupState.cs +++ b/MediaBrowser.Controller/SyncPlay/IGroupState.cs @@ -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. diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextItemGroupRequest.cs index 73b7d0908b..ab60265a6b 100644 --- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextTrackGroupRequest.cs +++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextItemGroupRequest.cs @@ -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) diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousItemGroupRequest.cs index 4c70beb0ef..445c5fce65 100644 --- a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousTrackGroupRequest.cs +++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousItemGroupRequest.cs @@ -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) |
