Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

3 files changed, 14 insertions, 20 deletions

diff --git a/MediaBrowser.Model/Session/GenericCommand.cs b/MediaBrowser.Model/Session/GeneralCommand.cs
index f7ea0a84a..0de7d6dd8 100644
--- a/MediaBrowser.Model/Session/GenericCommand.cs
+++ b/MediaBrowser.Model/Session/GeneralCommand.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace MediaBrowser.Model.Session
 {
-    public class GenericCommand
+    public class GeneralCommand
     {
         public string Name { get; set; }
 
@@ -11,7 +11,7 @@ namespace MediaBrowser.Model.Session
 
         public Dictionary<string, string> Arguments { get; set; }
 
-        public GenericCommand()
+        public GeneralCommand()
         {
             Arguments = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
         }
@@ -20,7 +20,7 @@ namespace MediaBrowser.Model.Session
     /// <summary>
     /// This exists simply to identify a set of known commands.
     /// </summary>
-    public enum CoreGenericCommand
+    public enum GeneralCommandType
     {
         MoveUp = 0,
         MoveDown = 1,
diff --git a/MediaBrowser.Model/Session/PlayRequest.cs b/MediaBrowser.Model/Session/PlayRequest.cs
index 949274a5d..74d7a70a3 100644
--- a/MediaBrowser.Model/Session/PlayRequest.cs
+++ b/MediaBrowser.Model/Session/PlayRequest.cs
@@ -39,14 +39,22 @@ namespace MediaBrowser.Model.Session
         /// <summary>
         /// The play now
         /// </summary>
-        PlayNow,
+        PlayNow = 0,
         /// <summary>
         /// The play next
         /// </summary>
-        PlayNext,
+        PlayNext = 1,
         /// <summary>
         /// The play last
         /// </summary>
-        PlayLast
+        PlayLast = 2,
+        /// <summary>
+        /// The play instant mix
+        /// </summary>
+        PlayInstantMix = 3,
+        /// <summary>
+        /// The play shuffle
+        /// </summary>
+        PlayShuffle = 4
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/SystemCommand.cs b/MediaBrowser.Model/Session/SystemCommand.cs
deleted file mode 100644
index 2fcaef6e3..000000000
--- a/MediaBrowser.Model/Session/SystemCommand.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-
-namespace MediaBrowser.Model.Session
-{
-    public enum SystemCommand
-    {
-        GoHome,
-        GoToSettings,
-        VolumeUp,
-        VolumeDown,
-        Mute,
-        Unmute,
-        ToggleMute
-    }
-}