Check that client is playing the right item

Send date when playback command is emitted
Rename some classes

7 files changed, 43 insertions, 15 deletions

diff --git a/MediaBrowser.Model/Syncplay/SyncplayGroupUpdate.cs b/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
 {
     /// <summary>
-    /// Class SyncplayGroupUpdate.
+    /// Class GroupUpdate.
     /// </summary>
-    public class SyncplayGroupUpdate<T>
+    public class GroupUpdate<T>
     {
         /// <summary>
         /// Gets or sets the group identifier.
@@ -15,7 +15,7 @@ namespace MediaBrowser.Model.Syncplay
         /// Gets or sets the update type.
         /// </summary>
         /// <value>The update type.</value>
-        public SyncplayGroupUpdateType Type { get; set; }
+        public GroupUpdateType Type { get; set; }
 
         /// <summary>
         /// Gets or sets the data.
diff --git a/MediaBrowser.Model/Syncplay/SyncplayGroupUpdateType.cs b/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
 {
     /// <summary>
-    /// Enum SyncplayGroupUpdateType
+    /// Enum GroupUpdateType
     /// </summary>
-    public enum SyncplayGroupUpdateType
+    public enum GroupUpdateType
     {
         /// <summary>
         /// 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
+{
+    /// <summary>
+    /// Class JoinGroupRequest.
+    /// </summary>
+    public class JoinGroupRequest
+    {
+        /// <summary>
+        /// Gets or sets the Group id.
+        /// </summary>
+        /// <value>The Group id to join.</value>
+        public Guid GroupId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the playing item id.
+        /// </summary>
+        /// <value>The client's currently playing item id.</value>
+        public Guid PlayingItemId { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Syncplay/SyncplayRequestInfo.cs b/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
 {
     /// <summary>
-    /// Class SyncplayRequestInfo.
+    /// Class PlaybackRequest.
     /// </summary>
-    public class SyncplayRequestInfo
+    public class PlaybackRequest
     {
         /// <summary>
         /// Gets or sets the request type.
         /// </summary>
         /// <value>The request type.</value>
-        public SyncplayRequestType Type;
+        public PlaybackRequestType Type;
 
         /// <summary>
         /// 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
index 44d7a0af26..da770736c7 100644
--- a/MediaBrowser.Model/Syncplay/SyncplayRequestType.cs
+++ b/MediaBrowser.Model/Syncplay/PlaybackRequestType.cs
@@ -1,9 +1,9 @@
 namespace MediaBrowser.Model.Syncplay
 {
     /// <summary>
-    /// Enum SyncplayRequestType
+    /// Enum PlaybackRequestType
     /// </summary>
-    public enum SyncplayRequestType
+    public enum PlaybackRequestType
     {
         /// <summary>
         /// A user is requesting a play command for the group.
diff --git a/MediaBrowser.Model/Syncplay/SyncplayCommand.cs b/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
 {
     /// <summary>
-    /// Class SyncplayCommand.
+    /// Class SendCommand.
     /// </summary>
-    public class SyncplayCommand
+    public class SendCommand
     {
         /// <summary>
         /// Gets or sets the group identifier.
@@ -27,6 +27,12 @@ namespace MediaBrowser.Model.Syncplay
         /// Gets or sets the command.
         /// </summary>
         /// <value>The command.</value>
-        public SyncplayCommandType Command { get; set; }
+        public SendCommandType Command { get; set; }
+
+        /// <summary>
+        /// Gets or sets the UTC time when this command has been emitted.
+        /// </summary>
+        /// <value>The UTC time when this command has been emitted.</value>
+        public string EmittedAt { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Syncplay/SyncplayCommandType.cs b/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
 {
     /// <summary>
-    /// Enum SyncplayCommandType.
+    /// Enum SendCommandType.
     /// </summary>
-    public enum SyncplayCommandType
+    public enum SendCommandType
     {
         /// <summary>
         /// The play command. Instructs users to start playback.