Merge pull request #3194 from OancaAndrei/syncplay-enhanced

SyncPlay for TV series (and Music)

18 files changed, 688 insertions, 0 deletions

diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/AbstractPlaybackRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/AbstractPlaybackRequest.cs
new file mode 100644
index 0000000000..4090f65b9c
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/AbstractPlaybackRequest.cs
@@ -0,0 +1,29 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class AbstractPlaybackRequest.
+    /// </summary>
+    public abstract class AbstractPlaybackRequest : IGroupPlaybackRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AbstractPlaybackRequest"/> class.
+        /// </summary>
+        protected AbstractPlaybackRequest()
+        {
+            // Do nothing.
+        }
+
+        /// <inheritdoc />
+        public RequestType Type { get; } = RequestType.Playback;
+
+        /// <inheritdoc />
+        public abstract PlaybackRequestType Action { get; }
+
+        /// <inheritdoc />
+        public abstract void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken);
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/BufferGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/BufferGroupRequest.cs
new file mode 100644
index 0000000000..11cc99fcda
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/BufferGroupRequest.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class BufferGroupRequest.
+    /// </summary>
+    public class BufferGroupRequest : AbstractPlaybackRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BufferGroupRequest"/> class.
+        /// </summary>
+        /// <param name="when">When the request has been made, as reported by the client.</param>
+        /// <param name="positionTicks">The position ticks.</param>
+        /// <param name="isPlaying">Whether the client playback is unpaused.</param>
+        /// <param name="playlistItemId">The playlist item identifier of the playing item.</param>
+        public BufferGroupRequest(DateTime when, long positionTicks, bool isPlaying, Guid playlistItemId)
+        {
+            When = when;
+            PositionTicks = positionTicks;
+            IsPlaying = isPlaying;
+            PlaylistItemId = playlistItemId;
+        }
+
+        /// <summary>
+        /// Gets when the request has been made by the client.
+        /// </summary>
+        /// <value>The date of the request.</value>
+        public DateTime When { get; }
+
+        /// <summary>
+        /// Gets the position ticks.
+        /// </summary>
+        /// <value>The position ticks.</value>
+        public long PositionTicks { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the client playback is unpaused.
+        /// </summary>
+        /// <value>The client playback status.</value>
+        public bool IsPlaying { get; }
+
+        /// <summary>
+        /// Gets the playlist item identifier of the playing item.
+        /// </summary>
+        /// <value>The playlist item identifier.</value>
+        public Guid PlaylistItemId { get; }
+
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.Buffer;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(this, context, state.Type, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/IgnoreWaitGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/IgnoreWaitGroupRequest.cs
new file mode 100644
index 0000000000..64ef791ed7
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/IgnoreWaitGroupRequest.cs
@@ -0,0 +1,36 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class IgnoreWaitGroupRequest.
+    /// </summary>
+    public class IgnoreWaitGroupRequest : AbstractPlaybackRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="IgnoreWaitGroupRequest"/> class.
+        /// </summary>
+        /// <param name="ignoreWait">Whether the client should be ignored.</param>
+        public IgnoreWaitGroupRequest(bool ignoreWait)
+        {
+            IgnoreWait = ignoreWait;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the client should be ignored.
+        /// </summary>
+        /// <value>The client group-wait status.</value>
+        public bool IgnoreWait { get; }
+
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.IgnoreWait;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(this, context, state.Type, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/MovePlaylistItemGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/MovePlaylistItemGroupRequest.cs
new file mode 100644
index 0000000000..9cd8da5668
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/MovePlaylistItemGroupRequest.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class MovePlaylistItemGroupRequest.
+    /// </summary>
+    public class MovePlaylistItemGroupRequest : AbstractPlaybackRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MovePlaylistItemGroupRequest"/> class.
+        /// </summary>
+        /// <param name="playlistItemId">The playlist identifier of the item.</param>
+        /// <param name="newIndex">The new position.</param>
+        public MovePlaylistItemGroupRequest(Guid playlistItemId, int newIndex)
+        {
+            PlaylistItemId = playlistItemId;
+            NewIndex = newIndex;
+        }
+
+        /// <summary>
+        /// Gets the playlist identifier of the item.
+        /// </summary>
+        /// <value>The playlist identifier of the item.</value>
+        public Guid PlaylistItemId { get; }
+
+        /// <summary>
+        /// Gets the new position.
+        /// </summary>
+        /// <value>The new position.</value>
+        public int NewIndex { get; }
+
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.MovePlaylistItem;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(this, context, state.Type, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextItemGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextItemGroupRequest.cs
new file mode 100644
index 0000000000..e0ae0deb76
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/NextItemGroupRequest.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class NextItemGroupRequest.
+    /// </summary>
+    public class NextItemGroupRequest : AbstractPlaybackRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NextItemGroupRequest"/> class.
+        /// </summary>
+        /// <param name="playlistItemId">The playing item identifier.</param>
+        public NextItemGroupRequest(Guid playlistItemId)
+        {
+            PlaylistItemId = playlistItemId;
+        }
+
+        /// <summary>
+        /// Gets the playing item identifier.
+        /// </summary>
+        /// <value>The playing item identifier.</value>
+        public Guid PlaylistItemId { get; }
+
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.NextItem;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(this, context, state.Type, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PauseGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PauseGroupRequest.cs
new file mode 100644
index 0000000000..2869b35f77
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PauseGroupRequest.cs
@@ -0,0 +1,21 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class PauseGroupRequest.
+    /// </summary>
+    public class PauseGroupRequest : AbstractPlaybackRequest
+    {
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.Pause;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(this, context, state.Type, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PingGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PingGroupRequest.cs
new file mode 100644
index 0000000000..8ef3b20303
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PingGroupRequest.cs
@@ -0,0 +1,36 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class PingGroupRequest.
+    /// </summary>
+    public class PingGroupRequest : AbstractPlaybackRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PingGroupRequest"/> class.
+        /// </summary>
+        /// <param name="ping">The ping time.</param>
+        public PingGroupRequest(long ping)
+        {
+            Ping = ping;
+        }
+
+        /// <summary>
+        /// Gets the ping time.
+        /// </summary>
+        /// <value>The ping time.</value>
+        public long Ping { get; }
+
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.Ping;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(this, context, state.Type, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs
new file mode 100644
index 0000000000..16f9b40874
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PlayGroupRequest.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class PlayGroupRequest.
+    /// </summary>
+    public class PlayGroupRequest : AbstractPlaybackRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PlayGroupRequest"/> class.
+        /// </summary>
+        /// <param name="playingQueue">The playing queue.</param>
+        /// <param name="playingItemPosition">The playing item position.</param>
+        /// <param name="startPositionTicks">The start position ticks.</param>
+        public PlayGroupRequest(IReadOnlyList<Guid> playingQueue, int playingItemPosition, long startPositionTicks)
+        {
+            PlayingQueue = playingQueue ?? Array.Empty<Guid>();
+            PlayingItemPosition = playingItemPosition;
+            StartPositionTicks = startPositionTicks;
+        }
+
+        /// <summary>
+        /// Gets the playing queue.
+        /// </summary>
+        /// <value>The playing queue.</value>
+        public IReadOnlyList<Guid> PlayingQueue { get; }
+
+        /// <summary>
+        /// Gets the position of the playing item in the queue.
+        /// </summary>
+        /// <value>The playing item position.</value>
+        public int PlayingItemPosition { get; }
+
+        /// <summary>
+        /// Gets the start position ticks.
+        /// </summary>
+        /// <value>The start position ticks.</value>
+        public long StartPositionTicks { get; }
+
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.Play;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(this, context, state.Type, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousItemGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousItemGroupRequest.cs
new file mode 100644
index 0000000000..166ee08007
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/PreviousItemGroupRequest.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class PreviousItemGroupRequest.
+    /// </summary>
+    public class PreviousItemGroupRequest : AbstractPlaybackRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PreviousItemGroupRequest"/> class.
+        /// </summary>
+        /// <param name="playlistItemId">The playing item identifier.</param>
+        public PreviousItemGroupRequest(Guid playlistItemId)
+        {
+            PlaylistItemId = playlistItemId;
+        }
+
+        /// <summary>
+        /// Gets the playing item identifier.
+        /// </summary>
+        /// <value>The playing item identifier.</value>
+        public Guid PlaylistItemId { get; }
+
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.PreviousItem;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(this, context, state.Type, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs
new file mode 100644
index 0000000000..d4af63b6d4
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/QueueGroupRequest.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class QueueGroupRequest.
+    /// </summary>
+    public class QueueGroupRequest : AbstractPlaybackRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="QueueGroupRequest"/> class.
+        /// </summary>
+        /// <param name="items">The items to add to the queue.</param>
+        /// <param name="mode">The enqueue mode.</param>
+        public QueueGroupRequest(IReadOnlyList<Guid> items, GroupQueueMode mode)
+        {
+            ItemIds = items ?? Array.Empty<Guid>();
+            Mode = mode;
+        }
+
+        /// <summary>
+        /// Gets the items to enqueue.
+        /// </summary>
+        /// <value>The items to enqueue.</value>
+        public IReadOnlyList<Guid> ItemIds { get; }
+
+        /// <summary>
+        /// Gets the mode in which to add the new items.
+        /// </summary>
+        /// <value>The enqueue mode.</value>
+        public GroupQueueMode Mode { get; }
+
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.Queue;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(this, context, state.Type, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/ReadyGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/ReadyGroupRequest.cs
new file mode 100644
index 0000000000..74f01cbeaf
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/ReadyGroupRequest.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class ReadyGroupRequest.
+    /// </summary>
+    public class ReadyGroupRequest : AbstractPlaybackRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ReadyGroupRequest"/> class.
+        /// </summary>
+        /// <param name="when">When the request has been made, as reported by the client.</param>
+        /// <param name="positionTicks">The position ticks.</param>
+        /// <param name="isPlaying">Whether the client playback is unpaused.</param>
+        /// <param name="playlistItemId">The playlist item identifier of the playing item.</param>
+        public ReadyGroupRequest(DateTime when, long positionTicks, bool isPlaying, Guid playlistItemId)
+        {
+            When = when;
+            PositionTicks = positionTicks;
+            IsPlaying = isPlaying;
+            PlaylistItemId = playlistItemId;
+        }
+
+        /// <summary>
+        /// Gets when the request has been made by the client.
+        /// </summary>
+        /// <value>The date of the request.</value>
+        public DateTime When { get; }
+
+        /// <summary>
+        /// Gets the position ticks.
+        /// </summary>
+        /// <value>The position ticks.</value>
+        public long PositionTicks { get; }
+
+        /// <summary>
+        /// Gets a value indicating whether the client playback is unpaused.
+        /// </summary>
+        /// <value>The client playback status.</value>
+        public bool IsPlaying { get; }
+
+        /// <summary>
+        /// Gets the playlist item identifier of the playing item.
+        /// </summary>
+        /// <value>The playlist item identifier.</value>
+        public Guid PlaylistItemId { get; }
+
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.Ready;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(this, context, state.Type, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs
new file mode 100644
index 0000000000..47c06c2227
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/RemoveFromPlaylistGroupRequest.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class RemoveFromPlaylistGroupRequest.
+    /// </summary>
+    public class RemoveFromPlaylistGroupRequest : AbstractPlaybackRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoveFromPlaylistGroupRequest"/> class.
+        /// </summary>
+        /// <param name="items">The playlist ids of the items to remove.</param>
+        public RemoveFromPlaylistGroupRequest(IReadOnlyList<Guid> items)
+        {
+            PlaylistItemIds = items ?? Array.Empty<Guid>();
+        }
+
+        /// <summary>
+        /// Gets the playlist identifiers ot the items.
+        /// </summary>
+        /// <value>The playlist identifiers ot the items.</value>
+        public IReadOnlyList<Guid> PlaylistItemIds { get; }
+
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.RemoveFromPlaylist;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(this, context, state.Type, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SeekGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SeekGroupRequest.cs
new file mode 100644
index 0000000000..ecaa689ae3
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SeekGroupRequest.cs
@@ -0,0 +1,36 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class SeekGroupRequest.
+    /// </summary>
+    public class SeekGroupRequest : AbstractPlaybackRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SeekGroupRequest"/> class.
+        /// </summary>
+        /// <param name="positionTicks">The position ticks.</param>
+        public SeekGroupRequest(long positionTicks)
+        {
+            PositionTicks = positionTicks;
+        }
+
+        /// <summary>
+        /// Gets the position ticks.
+        /// </summary>
+        /// <value>The position ticks.</value>
+        public long PositionTicks { get; }
+
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.Seek;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(this, context, state.Type, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetPlaylistItemGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetPlaylistItemGroupRequest.cs
new file mode 100644
index 0000000000..c3451703ed
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetPlaylistItemGroupRequest.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class SetPlaylistItemGroupRequest.
+    /// </summary>
+    public class SetPlaylistItemGroupRequest : AbstractPlaybackRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SetPlaylistItemGroupRequest"/> class.
+        /// </summary>
+        /// <param name="playlistItemId">The playlist identifier of the item.</param>
+        public SetPlaylistItemGroupRequest(Guid playlistItemId)
+        {
+            PlaylistItemId = playlistItemId;
+        }
+
+        /// <summary>
+        /// Gets the playlist identifier of the playing item.
+        /// </summary>
+        /// <value>The playlist identifier of the playing item.</value>
+        public Guid PlaylistItemId { get; }
+
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.SetPlaylistItem;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(this, context, state.Type, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetRepeatModeGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetRepeatModeGroupRequest.cs
new file mode 100644
index 0000000000..51011672ea
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetRepeatModeGroupRequest.cs
@@ -0,0 +1,36 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class SetRepeatModeGroupRequest.
+    /// </summary>
+    public class SetRepeatModeGroupRequest : AbstractPlaybackRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SetRepeatModeGroupRequest"/> class.
+        /// </summary>
+        /// <param name="mode">The repeat mode.</param>
+        public SetRepeatModeGroupRequest(GroupRepeatMode mode)
+        {
+            Mode = mode;
+        }
+
+        /// <summary>
+        /// Gets the repeat mode.
+        /// </summary>
+        /// <value>The repeat mode.</value>
+        public GroupRepeatMode Mode { get; }
+
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.SetRepeatMode;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(this, context, state.Type, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetShuffleModeGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetShuffleModeGroupRequest.cs
new file mode 100644
index 0000000000..d7b2504b4b
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/SetShuffleModeGroupRequest.cs
@@ -0,0 +1,36 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class SetShuffleModeGroupRequest.
+    /// </summary>
+    public class SetShuffleModeGroupRequest : AbstractPlaybackRequest
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SetShuffleModeGroupRequest"/> class.
+        /// </summary>
+        /// <param name="mode">The shuffle mode.</param>
+        public SetShuffleModeGroupRequest(GroupShuffleMode mode)
+        {
+            Mode = mode;
+        }
+
+        /// <summary>
+        /// Gets the shuffle mode.
+        /// </summary>
+        /// <value>The shuffle mode.</value>
+        public GroupShuffleMode Mode { get; }
+
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.SetShuffleMode;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(this, context, state.Type, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/StopGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/StopGroupRequest.cs
new file mode 100644
index 0000000000..ad739213c5
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/StopGroupRequest.cs
@@ -0,0 +1,21 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class StopGroupRequest.
+    /// </summary>
+    public class StopGroupRequest : AbstractPlaybackRequest
+    {
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.Stop;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(this, context, state.Type, session, cancellationToken);
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/SyncPlay/PlaybackRequests/UnpauseGroupRequest.cs b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/UnpauseGroupRequest.cs
new file mode 100644
index 0000000000..aaf3d65a84
--- /dev/null
+++ b/MediaBrowser.Controller/SyncPlay/PlaybackRequests/UnpauseGroupRequest.cs
@@ -0,0 +1,21 @@
+using System.Threading;
+using MediaBrowser.Controller.Session;
+using MediaBrowser.Model.SyncPlay;
+
+namespace MediaBrowser.Controller.SyncPlay.PlaybackRequests
+{
+    /// <summary>
+    /// Class UnpauseGroupRequest.
+    /// </summary>
+    public class UnpauseGroupRequest : AbstractPlaybackRequest
+    {
+        /// <inheritdoc />
+        public override PlaybackRequestType Action { get; } = PlaybackRequestType.Unpause;
+
+        /// <inheritdoc />
+        public override void Apply(IGroupStateContext context, IGroupState state, SessionInfo session, CancellationToken cancellationToken)
+        {
+            state.HandleRequest(this, context, state.Type, session, cancellationToken);
+        }
+    }
+}