Merge branch 'api-migration' into api-syncplay

# Conflicts:
#	MediaBrowser.Api/SyncPlay/SyncPlayService.cs

1 files changed, 9 insertions, 4 deletions

diff --git a/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs b/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs
index f1e175fde..e89efeed8 100644
--- a/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs
+++ b/MediaBrowser.Model/SyncPlay/PlaybackRequestType.cs
@@ -1,7 +1,7 @@
 namespace MediaBrowser.Model.SyncPlay
 {
     /// <summary>
-    /// Enum PlaybackRequestType
+    /// Enum PlaybackRequestType.
     /// </summary>
     public enum PlaybackRequestType
     {
@@ -9,25 +9,30 @@ namespace MediaBrowser.Model.SyncPlay
         /// A user is requesting a play command for the group.
         /// </summary>
         Play = 0,
+
         /// <summary>
         /// A user is requesting a pause command for the group.
         /// </summary>
         Pause = 1,
+
         /// <summary>
         /// A user is requesting a seek command for the group.
         /// </summary>
         Seek = 2,
+
         /// <summary>
         /// A user is signaling that playback is buffering.
         /// </summary>
-        Buffering = 3,
+        Buffer = 3,
+
         /// <summary>
         /// A user is signaling that playback resumed.
         /// </summary>
-        BufferingDone = 4,
+        Ready = 4,
+
         /// <summary>
         /// A user is reporting its ping.
         /// </summary>
-        UpdatePing = 5
+        Ping = 5
     }
 }