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

3 files changed, 10 insertions, 12 deletions

diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 28c5822e9..dc5e26be3 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -593,17 +593,9 @@ namespace MediaBrowser.Model.ApiClient
         /// Sends the command asynchronous.
         /// </summary>
         /// <param name="sessionId">The session identifier.</param>
-        /// <param name="request">The request.</param>
-        /// <returns>Task.</returns>
-        Task SendCommandAsync(string sessionId, GenericCommand request);
-        
-        /// <summary>
-        /// Sends a system command to the client
-        /// </summary>
-        /// <param name="sessionId">The session id.</param>
         /// <param name="command">The command.</param>
         /// <returns>Task.</returns>
-        Task SendSystemCommandAsync(string sessionId, SystemCommand command);
+        Task SendCommandAsync(string sessionId, GeneralCommand command);
 
         /// <summary>
         /// Instructs the client to display a message to the user
diff --git a/MediaBrowser.Model/ApiClient/IServerEvents.cs b/MediaBrowser.Model/ApiClient/IServerEvents.cs
index 0a38c63ad..e13f3cc2c 100644
--- a/MediaBrowser.Model/ApiClient/IServerEvents.cs
+++ b/MediaBrowser.Model/ApiClient/IServerEvents.cs
@@ -66,7 +66,7 @@ namespace MediaBrowser.Model.ApiClient
         /// <summary>
         /// Occurs when [system command].
         /// </summary>
-        event EventHandler<SystemCommandEventArgs> SystemCommand;
+        event EventHandler<GeneralCommandEventArgs> GeneralCommand;
         /// <summary>
         /// Occurs when [notification added].
         /// </summary>
diff --git a/MediaBrowser.Model/ApiClient/ServerEventArgs.cs b/MediaBrowser.Model/ApiClient/ServerEventArgs.cs
index d3212caf4..6637edd74 100644
--- a/MediaBrowser.Model/ApiClient/ServerEventArgs.cs
+++ b/MediaBrowser.Model/ApiClient/ServerEventArgs.cs
@@ -152,13 +152,19 @@ namespace MediaBrowser.Model.ApiClient
     /// <summary>
     /// Class SystemCommandEventArgs
     /// </summary>
-    public class SystemCommandEventArgs : EventArgs
+    public class GeneralCommandEventArgs : EventArgs
     {
         /// <summary>
         /// Gets or sets the command.
         /// </summary>
         /// <value>The command.</value>
-        public SystemCommand Command { get; set; }
+        public GeneralCommand Command { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type of the known command.
+        /// </summary>
+        /// <value>The type of the known command.</value>
+        public GeneralCommandType? KnownCommandType { get; set; }
     }
 
     /// <summary>