diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index b1519b5729..6a64209c1a 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -1156,7 +1156,7 @@ namespace Emby.Server.Implementations.Session
}
///
- public async Task SendSyncplayCommand(string sessionId, SyncplayCommand command, CancellationToken cancellationToken)
+ public async Task SendSyncplayCommand(string sessionId, SendCommand command, CancellationToken cancellationToken)
{
CheckDisposed();
var session = GetSessionToRemoteControl(sessionId);
@@ -1164,7 +1164,7 @@ namespace Emby.Server.Implementations.Session
}
///
- public async Task SendSyncplayGroupUpdate(string sessionId, SyncplayGroupUpdate command, CancellationToken cancellationToken)
+ public async Task SendSyncplayGroupUpdate(string sessionId, GroupUpdate command, CancellationToken cancellationToken)
{
CheckDisposed();
var session = GetSessionToRemoteControl(sessionId);
diff --git a/Emby.Server.Implementations/Syncplay/SyncplayController.cs b/Emby.Server.Implementations/Syncplay/SyncplayController.cs
index b156e5a879..fb37b2fb6f 100644
--- a/Emby.Server.Implementations/Syncplay/SyncplayController.cs
+++ b/Emby.Server.Implementations/Syncplay/SyncplayController.cs
@@ -129,7 +129,7 @@ namespace Emby.Server.Implementations.Syncplay
}
}
- private Task SendGroupUpdate(SessionInfo from, BroadcastType type, SyncplayGroupUpdate message)
+ private Task SendGroupUpdate(SessionInfo from, BroadcastType type, GroupUpdate message)
{
IEnumerable GetTasks()
{
@@ -143,7 +143,7 @@ namespace Emby.Server.Implementations.Syncplay
return Task.WhenAll(GetTasks());
}
- private Task SendCommand(SessionInfo from, BroadcastType type, SyncplayCommand message)
+ private Task SendCommand(SessionInfo from, BroadcastType type, SendCommand message)
{
IEnumerable GetTasks()
{
@@ -157,18 +157,20 @@ namespace Emby.Server.Implementations.Syncplay
return Task.WhenAll(GetTasks());
}
- private SyncplayCommand NewSyncplayCommand(SyncplayCommandType type) {
- var command = new SyncplayCommand();
+ private SendCommand NewSyncplayCommand(SendCommandType type)
+ {
+ var command = new SendCommand();
command.GroupId = _group.GroupId.ToString();
command.Command = type;
command.PositionTicks = _group.PositionTicks;
command.When = _group.LastActivity.ToUniversalTime().ToString("o");
+ command.EmittedAt = DateTime.UtcNow.ToUniversalTime().ToString("o");
return command;
}
- private SyncplayGroupUpdate NewSyncplayGroupUpdate(SyncplayGroupUpdateType type, T data)
+ private GroupUpdate NewSyncplayGroupUpdate(GroupUpdateType type, T data)
{
- var command = new SyncplayGroupUpdate();
+ var command = new GroupUpdate();
command.GroupId = _group.GroupId.ToString();
command.Type = type;
command.Data = data;
@@ -186,35 +188,37 @@ namespace Emby.Server.Implementations.Syncplay
_group.PositionTicks = session.PlayState.PositionTicks ??= 0;
_group.LastActivity = DateTime.UtcNow;
- var updateSession = NewSyncplayGroupUpdate(SyncplayGroupUpdateType.GroupJoined, DateTime.UtcNow.ToUniversalTime().ToString("o"));
+ var updateSession = NewSyncplayGroupUpdate(GroupUpdateType.GroupJoined, DateTime.UtcNow.ToUniversalTime().ToString("o"));
SendGroupUpdate(session, BroadcastType.SingleSession, updateSession);
- var pauseCommand = NewSyncplayCommand(SyncplayCommandType.Pause);
+ var pauseCommand = NewSyncplayCommand(SendCommandType.Pause);
SendCommand(session, BroadcastType.SingleSession, pauseCommand);
}
///
- public void SessionJoin(SessionInfo session)
+ public void SessionJoin(SessionInfo session, JoinGroupRequest request)
{
- if (session.NowPlayingItem != null && session.NowPlayingItem.Id.Equals(_group.PlayingItem.Id))
+ if (session.NowPlayingItem != null &&
+ session.NowPlayingItem.Id.Equals(_group.PlayingItem.Id) &&
+ request.PlayingItemId.Equals(_group.PlayingItem.Id))
{
_group.AddSession(session);
_syncplayManager.MapSessionToGroup(session, this);
- var updateSession = NewSyncplayGroupUpdate(SyncplayGroupUpdateType.GroupJoined, _group.PositionTicks);
+ var updateSession = NewSyncplayGroupUpdate(GroupUpdateType.GroupJoined, DateTime.UtcNow.ToUniversalTime().ToString("o"));
SendGroupUpdate(session, BroadcastType.SingleSession, updateSession);
- var updateOthers = NewSyncplayGroupUpdate(SyncplayGroupUpdateType.UserJoined, session.UserName);
+ var updateOthers = NewSyncplayGroupUpdate(GroupUpdateType.UserJoined, session.UserName);
SendGroupUpdate(session, BroadcastType.AllExceptSession, updateOthers);
// Client join and play, syncing will happen client side
if (!_group.IsPaused)
{
- var playCommand = NewSyncplayCommand(SyncplayCommandType.Play);
+ var playCommand = NewSyncplayCommand(SendCommandType.Play);
SendCommand(session, BroadcastType.SingleSession, playCommand);
}
else
{
- var pauseCommand = NewSyncplayCommand(SyncplayCommandType.Pause);
+ var pauseCommand = NewSyncplayCommand(SendCommandType.Pause);
SendCommand(session, BroadcastType.SingleSession, pauseCommand);
}
}
@@ -223,7 +227,7 @@ namespace Emby.Server.Implementations.Syncplay
var playRequest = new PlayRequest();
playRequest.ItemIds = new Guid[] { _group.PlayingItem.Id };
playRequest.StartPositionTicks = _group.PositionTicks;
- var update = NewSyncplayGroupUpdate(SyncplayGroupUpdateType.PrepareSession, playRequest);
+ var update = NewSyncplayGroupUpdate(GroupUpdateType.PrepareSession, playRequest);
SendGroupUpdate(session, BroadcastType.SingleSession, update);
}
}
@@ -234,17 +238,17 @@ namespace Emby.Server.Implementations.Syncplay
_group.RemoveSession(session);
_syncplayManager.UnmapSessionFromGroup(session, this);
- var updateSession = NewSyncplayGroupUpdate(SyncplayGroupUpdateType.GroupLeft, _group.PositionTicks);
+ var updateSession = NewSyncplayGroupUpdate(GroupUpdateType.GroupLeft, _group.PositionTicks);
SendGroupUpdate(session, BroadcastType.SingleSession, updateSession);
- var updateOthers = NewSyncplayGroupUpdate(SyncplayGroupUpdateType.UserLeft, session.UserName);
+ var updateOthers = NewSyncplayGroupUpdate(GroupUpdateType.UserLeft, session.UserName);
SendGroupUpdate(session, BroadcastType.AllExceptSession, updateOthers);
}
///
- public void HandleRequest(SessionInfo session, SyncplayRequestInfo request)
+ public void HandleRequest(SessionInfo session, PlaybackRequest request)
{
- if (request.Type.Equals(SyncplayRequestType.Play))
+ if (request.Type.Equals(PlaybackRequestType.Play))
{
if (_group.IsPaused)
{
@@ -256,17 +260,17 @@ namespace Emby.Server.Implementations.Syncplay
delay
);
- var command = NewSyncplayCommand(SyncplayCommandType.Play);
+ var command = NewSyncplayCommand(SendCommandType.Play);
SendCommand(session, BroadcastType.AllGroup, command);
}
else
{
// Client got lost
- var command = NewSyncplayCommand(SyncplayCommandType.Play);
+ var command = NewSyncplayCommand(SendCommandType.Play);
SendCommand(session, BroadcastType.SingleSession, command);
}
}
- else if (request.Type.Equals(SyncplayRequestType.Pause))
+ else if (request.Type.Equals(PlaybackRequestType.Pause))
{
if (!_group.IsPaused)
{
@@ -276,16 +280,16 @@ namespace Emby.Server.Implementations.Syncplay
_group.LastActivity = currentTime;
_group.PositionTicks += elapsedTime.Ticks > 0 ? elapsedTime.Ticks : 0;
- var command = NewSyncplayCommand(SyncplayCommandType.Pause);
+ var command = NewSyncplayCommand(SendCommandType.Pause);
SendCommand(session, BroadcastType.AllGroup, command);
}
else
{
- var command = NewSyncplayCommand(SyncplayCommandType.Pause);
+ var command = NewSyncplayCommand(SendCommandType.Pause);
SendCommand(session, BroadcastType.SingleSession, command);
}
}
- else if (request.Type.Equals(SyncplayRequestType.Seek))
+ else if (request.Type.Equals(PlaybackRequestType.Seek))
{
// Sanitize PositionTicks
var ticks = request.PositionTicks ??= 0;
@@ -300,11 +304,11 @@ namespace Emby.Server.Implementations.Syncplay
_group.PositionTicks = ticks;
_group.LastActivity = DateTime.UtcNow;
- var command = NewSyncplayCommand(SyncplayCommandType.Seek);
+ var command = NewSyncplayCommand(SendCommandType.Seek);
SendCommand(session, BroadcastType.AllGroup, command);
}
// TODO: client does not implement this yet
- else if (request.Type.Equals(SyncplayRequestType.Buffering))
+ else if (request.Type.Equals(PlaybackRequestType.Buffering))
{
if (!_group.IsPaused)
{
@@ -317,20 +321,20 @@ namespace Emby.Server.Implementations.Syncplay
_group.SetBuffering(session, true);
// Send pause command to all non-buffering sessions
- var command = NewSyncplayCommand(SyncplayCommandType.Pause);
+ var command = NewSyncplayCommand(SendCommandType.Pause);
SendCommand(session, BroadcastType.AllReady, command);
- var updateOthers = NewSyncplayGroupUpdate(SyncplayGroupUpdateType.GroupWait, session.UserName);
+ var updateOthers = NewSyncplayGroupUpdate(GroupUpdateType.GroupWait, session.UserName);
SendGroupUpdate(session, BroadcastType.AllExceptSession, updateOthers);
}
else
{
- var command = NewSyncplayCommand(SyncplayCommandType.Pause);
+ var command = NewSyncplayCommand(SendCommandType.Pause);
SendCommand(session, BroadcastType.SingleSession, command);
}
}
// TODO: client does not implement this yet
- else if (request.Type.Equals(SyncplayRequestType.BufferingComplete))
+ else if (request.Type.Equals(PlaybackRequestType.BufferingComplete))
{
if (_group.IsPaused)
{
@@ -344,7 +348,7 @@ namespace Emby.Server.Implementations.Syncplay
var clientPosition = TimeSpan.FromTicks(request.PositionTicks ??= 0) + elapsedTime;
var delay = _group.PositionTicks - clientPosition.Ticks;
- var command = NewSyncplayCommand(SyncplayCommandType.Pause);
+ var command = NewSyncplayCommand(SendCommandType.Pause);
command.When = currentTime.AddMilliseconds(
delay
).ToUniversalTime().ToString("o");
@@ -367,7 +371,7 @@ namespace Emby.Server.Implementations.Syncplay
_group.LastActivity = currentTime.AddMilliseconds(
delay
);
- var command = NewSyncplayCommand(SyncplayCommandType.Play);
+ var command = NewSyncplayCommand(SendCommandType.Play);
SendCommand(session, BroadcastType.AllExceptSession, command);
}
else
@@ -380,7 +384,7 @@ namespace Emby.Server.Implementations.Syncplay
delay
);
- var command = NewSyncplayCommand(SyncplayCommandType.Play);
+ var command = NewSyncplayCommand(SendCommandType.Play);
SendCommand(session, BroadcastType.AllGroup, command);
}
}
@@ -388,17 +392,17 @@ namespace Emby.Server.Implementations.Syncplay
else
{
// Make sure client has latest group state
- var command = NewSyncplayCommand(SyncplayCommandType.Play);
+ var command = NewSyncplayCommand(SendCommandType.Play);
SendCommand(session, BroadcastType.SingleSession, command);
}
}
- else if (request.Type.Equals(SyncplayRequestType.KeepAlive))
+ else if (request.Type.Equals(PlaybackRequestType.KeepAlive))
{
_group.UpdatePing(session, request.Ping ??= _group.DefaulPing);
- var keepAlive = new SyncplayGroupUpdate();
+ var keepAlive = new GroupUpdate();
keepAlive.GroupId = _group.GroupId.ToString();
- keepAlive.Type = SyncplayGroupUpdateType.KeepAlive;
+ keepAlive.Type = GroupUpdateType.KeepAlive;
SendGroupUpdate(session, BroadcastType.SingleSession, keepAlive);
}
}
diff --git a/Emby.Server.Implementations/Syncplay/SyncplayManager.cs b/Emby.Server.Implementations/Syncplay/SyncplayManager.cs
index 5c44326f5d..60d70e5fde 100644
--- a/Emby.Server.Implementations/Syncplay/SyncplayManager.cs
+++ b/Emby.Server.Implementations/Syncplay/SyncplayManager.cs
@@ -166,7 +166,7 @@ namespace Emby.Server.Implementations.Syncplay
if (user.Policy.SyncplayAccess != SyncplayAccess.CreateAndJoinGroups)
{
// TODO: shall an error message be sent back to the client?
- return;
+ throw new ArgumentException("User does not have permission to create groups");
}
if (IsSessionInGroup(session))
@@ -181,14 +181,14 @@ namespace Emby.Server.Implementations.Syncplay
}
///
- public void JoinGroup(SessionInfo session, string groupId)
+ public void JoinGroup(SessionInfo session, string groupId, JoinGroupRequest request)
{
var user = _userManager.GetUserById(session.UserId);
if (user.Policy.SyncplayAccess == SyncplayAccess.None)
{
// TODO: shall an error message be sent back to the client?
- return;
+ throw new ArgumentException("User does not have access to syncplay");
}
if (IsSessionInGroup(session))
@@ -204,18 +204,18 @@ namespace Emby.Server.Implementations.Syncplay
{
_logger.LogError("Syncplaymanager JoinGroup: " + groupId + " does not exist.");
- var update = new SyncplayGroupUpdate();
- update.Type = SyncplayGroupUpdateType.NotInGroup;
+ var update = new GroupUpdate();
+ update.Type = GroupUpdateType.NotInGroup;
_sessionManager.SendSyncplayGroupUpdate(session.Id.ToString(), update, CancellationToken.None);
return;
}
if (!HasAccessToItem(user, group.GetPlayingItemId()))
{
- return;
+ throw new ArgumentException("User does not have access to playing item");
}
- group.SessionJoin(session);
+ group.SessionJoin(session, request);
}
///
@@ -230,8 +230,8 @@ namespace Emby.Server.Implementations.Syncplay
{
_logger.LogWarning("Syncplaymanager HandleRequest: " + session.Id + " not in group.");
- var update = new SyncplayGroupUpdate();
- update.Type = SyncplayGroupUpdateType.NotInGroup;
+ var update = new GroupUpdate();
+ update.Type = GroupUpdateType.NotInGroup;
_sessionManager.SendSyncplayGroupUpdate(session.Id.ToString(), update, CancellationToken.None);
return;
}
@@ -276,14 +276,14 @@ namespace Emby.Server.Implementations.Syncplay
}
///
- public void HandleRequest(SessionInfo session, SyncplayRequestInfo request)
+ public void HandleRequest(SessionInfo session, PlaybackRequest request)
{
var user = _userManager.GetUserById(session.UserId);
if (user.Policy.SyncplayAccess == SyncplayAccess.None)
{
// TODO: same as LeaveGroup
- return;
+ throw new ArgumentException("User does not have access to syncplay");
}
ISyncplayController group;
@@ -293,14 +293,14 @@ namespace Emby.Server.Implementations.Syncplay
{
_logger.LogWarning("Syncplaymanager HandleRequest: " + session.Id + " not in group.");
- var update = new SyncplayGroupUpdate();
- update.Type = SyncplayGroupUpdateType.NotInGroup;
+ var update = new GroupUpdate();
+ update.Type = GroupUpdateType.NotInGroup;
_sessionManager.SendSyncplayGroupUpdate(session.Id.ToString(), update, CancellationToken.None);
return;
}
group.HandleRequest(session, request);
}
-
+
///
public void MapSessionToGroup(SessionInfo session, ISyncplayController group)
{
diff --git a/MediaBrowser.Api/Syncplay/SyncplayService.cs b/MediaBrowser.Api/Syncplay/SyncplayService.cs
index f17cca9ee7..0f9d1b7339 100644
--- a/MediaBrowser.Api/Syncplay/SyncplayService.cs
+++ b/MediaBrowser.Api/Syncplay/SyncplayService.cs
@@ -31,6 +31,13 @@ namespace MediaBrowser.Api.Syncplay
/// The Group id to join.
[ApiMember(Name = "GroupId", Description = "Group Id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
public string GroupId { get; set; }
+
+ ///
+ /// Gets or sets the playing item id.
+ ///
+ /// The client's currently playing item id.
+ [ApiMember(Name = "PlayingItemId", Description = "Client's playing item id", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
+ public string PlayingItemId { get; set; }
}
[Route("/Syncplay/{SessionId}/LeaveGroup", "POST", Summary = "Leave joined Syncplay group")]
@@ -160,7 +167,21 @@ namespace MediaBrowser.Api.Syncplay
public void Post(SyncplayJoinGroup request)
{
var currentSession = GetSession(_sessionContext);
- _syncplayManager.JoinGroup(currentSession, request.GroupId);
+ var joinRequest = new JoinGroupRequest();
+ joinRequest.GroupId = Guid.Parse(request.GroupId);
+ try
+ {
+ joinRequest.PlayingItemId = Guid.Parse(request.PlayingItemId);
+ }
+ catch (ArgumentNullException)
+ {
+ // Do nothing
+ }
+ catch (FormatException)
+ {
+ // Do nothing
+ }
+ _syncplayManager.JoinGroup(currentSession, request.GroupId, joinRequest);
}
///
@@ -191,8 +212,8 @@ namespace MediaBrowser.Api.Syncplay
public void Post(SyncplayPlayRequest request)
{
var currentSession = GetSession(_sessionContext);
- var syncplayRequest = new SyncplayRequestInfo();
- syncplayRequest.Type = SyncplayRequestType.Play;
+ var syncplayRequest = new PlaybackRequest();
+ syncplayRequest.Type = PlaybackRequestType.Play;
_syncplayManager.HandleRequest(currentSession, syncplayRequest);
}
@@ -203,8 +224,8 @@ namespace MediaBrowser.Api.Syncplay
public void Post(SyncplayPauseRequest request)
{
var currentSession = GetSession(_sessionContext);
- var syncplayRequest = new SyncplayRequestInfo();
- syncplayRequest.Type = SyncplayRequestType.Pause;
+ var syncplayRequest = new PlaybackRequest();
+ syncplayRequest.Type = PlaybackRequestType.Pause;
_syncplayManager.HandleRequest(currentSession, syncplayRequest);
}
@@ -215,8 +236,8 @@ namespace MediaBrowser.Api.Syncplay
public void Post(SyncplaySeekRequest request)
{
var currentSession = GetSession(_sessionContext);
- var syncplayRequest = new SyncplayRequestInfo();
- syncplayRequest.Type = SyncplayRequestType.Seek;
+ var syncplayRequest = new PlaybackRequest();
+ syncplayRequest.Type = PlaybackRequestType.Seek;
syncplayRequest.PositionTicks = request.PositionTicks;
_syncplayManager.HandleRequest(currentSession, syncplayRequest);
}
@@ -228,8 +249,8 @@ namespace MediaBrowser.Api.Syncplay
public void Post(SyncplayBufferingRequest request)
{
var currentSession = GetSession(_sessionContext);
- var syncplayRequest = new SyncplayRequestInfo();
- syncplayRequest.Type = request.Resume ? SyncplayRequestType.BufferingComplete : SyncplayRequestType.Buffering;
+ var syncplayRequest = new PlaybackRequest();
+ syncplayRequest.Type = request.Resume ? PlaybackRequestType.BufferingComplete : PlaybackRequestType.Buffering;
syncplayRequest.When = DateTime.Parse(request.When);
syncplayRequest.PositionTicks = request.PositionTicks;
_syncplayManager.HandleRequest(currentSession, syncplayRequest);
@@ -242,8 +263,8 @@ namespace MediaBrowser.Api.Syncplay
public void Post(SyncplayKeepAlive request)
{
var currentSession = GetSession(_sessionContext);
- var syncplayRequest = new SyncplayRequestInfo();
- syncplayRequest.Type = SyncplayRequestType.KeepAlive;
+ var syncplayRequest = new PlaybackRequest();
+ syncplayRequest.Type = PlaybackRequestType.KeepAlive;
syncplayRequest.Ping = Convert.ToInt64(request.Ping);
_syncplayManager.HandleRequest(currentSession, syncplayRequest);
}
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index 4bfc0c73f3..39c065b895 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -148,7 +148,7 @@ namespace MediaBrowser.Controller.Session
/// The command.
/// The cancellation token.
/// Task.
- Task SendSyncplayCommand(string sessionId, SyncplayCommand command, CancellationToken cancellationToken);
+ Task SendSyncplayCommand(string sessionId, SendCommand command, CancellationToken cancellationToken);
///
/// Sends the SyncplayGroupUpdate.
@@ -157,7 +157,7 @@ namespace MediaBrowser.Controller.Session
/// The group update.
/// The cancellation token.
/// Task.
- Task SendSyncplayGroupUpdate(string sessionId, SyncplayGroupUpdate command, CancellationToken cancellationToken);
+ Task SendSyncplayGroupUpdate(string sessionId, GroupUpdate command, CancellationToken cancellationToken);
///
/// Sends the browse command.
diff --git a/MediaBrowser.Controller/Syncplay/ISyncplayController.cs b/MediaBrowser.Controller/Syncplay/ISyncplayController.cs
index d35ae31019..5b08eac0a4 100644
--- a/MediaBrowser.Controller/Syncplay/ISyncplayController.cs
+++ b/MediaBrowser.Controller/Syncplay/ISyncplayController.cs
@@ -37,7 +37,8 @@ namespace MediaBrowser.Controller.Syncplay
/// Adds the session to the group.
///
/// The session.
- void SessionJoin(SessionInfo session);
+ /// The request.
+ void SessionJoin(SessionInfo session, JoinGroupRequest request);
///
/// Removes the session from the group.
@@ -50,7 +51,7 @@ namespace MediaBrowser.Controller.Syncplay
///
/// The session.
/// The requested action.
- void HandleRequest(SessionInfo session, SyncplayRequestInfo request);
+ void HandleRequest(SessionInfo session, PlaybackRequest request);
///
/// Gets the info about the group for the clients.
diff --git a/MediaBrowser.Controller/Syncplay/ISyncplayManager.cs b/MediaBrowser.Controller/Syncplay/ISyncplayManager.cs
index 09920a19ff..d0cf8fa9c8 100644
--- a/MediaBrowser.Controller/Syncplay/ISyncplayManager.cs
+++ b/MediaBrowser.Controller/Syncplay/ISyncplayManager.cs
@@ -21,7 +21,8 @@ namespace MediaBrowser.Controller.Syncplay
///
/// The session.
/// The group id.
- void JoinGroup(SessionInfo session, string groupId);
+ /// The request.
+ void JoinGroup(SessionInfo session, string groupId, JoinGroupRequest request);
///
/// Removes the session from a group.
@@ -41,7 +42,7 @@ namespace MediaBrowser.Controller.Syncplay
///
/// The session.
/// The request.
- void HandleRequest(SessionInfo session, SyncplayRequestInfo request);
+ void HandleRequest(SessionInfo session, PlaybackRequest request);
///
/// Maps a session to a group.
diff --git a/MediaBrowser.Model/Syncplay/SyncplayGroupUpdate.cs b/MediaBrowser.Model/Syncplay/GroupUpdate.cs
similarity index 80%
rename from MediaBrowser.Model/Syncplay/SyncplayGroupUpdate.cs
rename to MediaBrowser.Model/Syncplay/GroupUpdate.cs
index c5c2f35404..cc49e92a9c 100644
--- a/MediaBrowser.Model/Syncplay/SyncplayGroupUpdate.cs
+++ b/MediaBrowser.Model/Syncplay/GroupUpdate.cs
@@ -1,9 +1,9 @@
namespace MediaBrowser.Model.Syncplay
{
///
- /// Class SyncplayGroupUpdate.
+ /// Class GroupUpdate.
///
- public class SyncplayGroupUpdate
+ public class GroupUpdate
{
///
/// Gets or sets the group identifier.
@@ -15,7 +15,7 @@ namespace MediaBrowser.Model.Syncplay
/// Gets or sets the update type.
///
/// The update type.
- public SyncplayGroupUpdateType Type { get; set; }
+ public GroupUpdateType Type { get; set; }
///
/// Gets or sets the data.
diff --git a/MediaBrowser.Model/Syncplay/SyncplayGroupUpdateType.cs b/MediaBrowser.Model/Syncplay/GroupUpdateType.cs
similarity index 94%
rename from MediaBrowser.Model/Syncplay/SyncplayGroupUpdateType.cs
rename to MediaBrowser.Model/Syncplay/GroupUpdateType.cs
index c7c5f534dc..ceb778b36f 100644
--- a/MediaBrowser.Model/Syncplay/SyncplayGroupUpdateType.cs
+++ b/MediaBrowser.Model/Syncplay/GroupUpdateType.cs
@@ -1,9 +1,9 @@
namespace MediaBrowser.Model.Syncplay
{
///
- /// Enum SyncplayGroupUpdateType
+ /// Enum GroupUpdateType
///
- public enum SyncplayGroupUpdateType
+ public enum GroupUpdateType
{
///
/// The user-joined update. Tells members of a group about a new user.
diff --git a/MediaBrowser.Model/Syncplay/JoinGroupRequest.cs b/MediaBrowser.Model/Syncplay/JoinGroupRequest.cs
new file mode 100644
index 0000000000..8d8a2646ac
--- /dev/null
+++ b/MediaBrowser.Model/Syncplay/JoinGroupRequest.cs
@@ -0,0 +1,22 @@
+using System;
+
+namespace MediaBrowser.Model.Syncplay
+{
+ ///
+ /// Class JoinGroupRequest.
+ ///
+ public class JoinGroupRequest
+ {
+ ///
+ /// Gets or sets the Group id.
+ ///
+ /// The Group id to join.
+ public Guid GroupId { get; set; }
+
+ ///
+ /// Gets or sets the playing item id.
+ ///
+ /// The client's currently playing item id.
+ public Guid PlayingItemId { get; set; }
+ }
+}
diff --git a/MediaBrowser.Model/Syncplay/SyncplayRequestInfo.cs b/MediaBrowser.Model/Syncplay/PlaybackRequest.cs
similarity index 87%
rename from MediaBrowser.Model/Syncplay/SyncplayRequestInfo.cs
rename to MediaBrowser.Model/Syncplay/PlaybackRequest.cs
index 7dba74ae94..cae769db0d 100644
--- a/MediaBrowser.Model/Syncplay/SyncplayRequestInfo.cs
+++ b/MediaBrowser.Model/Syncplay/PlaybackRequest.cs
@@ -3,15 +3,15 @@ using System;
namespace MediaBrowser.Model.Syncplay
{
///
- /// Class SyncplayRequestInfo.
+ /// Class PlaybackRequest.
///
- public class SyncplayRequestInfo
+ public class PlaybackRequest
{
///
/// Gets or sets the request type.
///
/// The request type.
- public SyncplayRequestType Type;
+ public PlaybackRequestType Type;
///
/// Gets or sets when the request has been made by the client.
diff --git a/MediaBrowser.Model/Syncplay/SyncplayRequestType.cs b/MediaBrowser.Model/Syncplay/PlaybackRequestType.cs
similarity index 92%
rename from MediaBrowser.Model/Syncplay/SyncplayRequestType.cs
rename to MediaBrowser.Model/Syncplay/PlaybackRequestType.cs
index 44d7a0af26..da770736c7 100644
--- a/MediaBrowser.Model/Syncplay/SyncplayRequestType.cs
+++ b/MediaBrowser.Model/Syncplay/PlaybackRequestType.cs
@@ -1,9 +1,9 @@
namespace MediaBrowser.Model.Syncplay
{
///
- /// Enum SyncplayRequestType
+ /// Enum PlaybackRequestType
///
- public enum SyncplayRequestType
+ public enum PlaybackRequestType
{
///
/// A user is requesting a play command for the group.
diff --git a/MediaBrowser.Model/Syncplay/SyncplayCommand.cs b/MediaBrowser.Model/Syncplay/SendCommand.cs
similarity index 69%
rename from MediaBrowser.Model/Syncplay/SyncplayCommand.cs
rename to MediaBrowser.Model/Syncplay/SendCommand.cs
index 769316e805..d9f3914030 100644
--- a/MediaBrowser.Model/Syncplay/SyncplayCommand.cs
+++ b/MediaBrowser.Model/Syncplay/SendCommand.cs
@@ -1,9 +1,9 @@
namespace MediaBrowser.Model.Syncplay
{
///
- /// Class SyncplayCommand.
+ /// Class SendCommand.
///
- public class SyncplayCommand
+ public class SendCommand
{
///
/// Gets or sets the group identifier.
@@ -27,6 +27,12 @@ namespace MediaBrowser.Model.Syncplay
/// Gets or sets the command.
///
/// The command.
- public SyncplayCommandType Command { get; set; }
+ public SendCommandType Command { get; set; }
+
+ ///
+ /// Gets or sets the UTC time when this command has been emitted.
+ ///
+ /// The UTC time when this command has been emitted.
+ public string EmittedAt { get; set; }
}
}
diff --git a/MediaBrowser.Model/Syncplay/SyncplayCommandType.cs b/MediaBrowser.Model/Syncplay/SendCommandType.cs
similarity index 87%
rename from MediaBrowser.Model/Syncplay/SyncplayCommandType.cs
rename to MediaBrowser.Model/Syncplay/SendCommandType.cs
index 87b9ad66d6..02e4774d0d 100644
--- a/MediaBrowser.Model/Syncplay/SyncplayCommandType.cs
+++ b/MediaBrowser.Model/Syncplay/SendCommandType.cs
@@ -1,9 +1,9 @@
namespace MediaBrowser.Model.Syncplay
{
///
- /// Enum SyncplayCommandType.
+ /// Enum SendCommandType.
///
- public enum SyncplayCommandType
+ public enum SendCommandType
{
///
/// The play command. Instructs users to start playback.