Merge remote-tracking branch 'upstream/master'

1 files changed, 40 insertions, 40 deletions

diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 71d95b97b..3acc5e892 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -622,42 +622,27 @@ namespace MediaBrowser.Server.Implementations.Session
             return session;
         }
 
-        /// <summary>
-        /// Sends the system command.
-        /// </summary>
-        /// <param name="sessionId">The session id.</param>
-        /// <param name="command">The command.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        public Task SendSystemCommand(Guid sessionId, SystemCommand command, CancellationToken cancellationToken)
+        public Task SendSystemCommand(Guid controllingSessionId, Guid sessionId, SystemCommand command, CancellationToken cancellationToken)
         {
             var session = GetSessionForRemoteControl(sessionId);
 
+            var controllingSession = GetSession(controllingSessionId);
+            AssertCanControl(session, controllingSession);
+            
             return session.SessionController.SendSystemCommand(command, cancellationToken);
         }
 
-        /// <summary>
-        /// Sends the message command.
-        /// </summary>
-        /// <param name="sessionId">The session id.</param>
-        /// <param name="command">The command.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        public Task SendMessageCommand(Guid sessionId, MessageCommand command, CancellationToken cancellationToken)
+        public Task SendMessageCommand(Guid controllingSessionId, Guid sessionId, MessageCommand command, CancellationToken cancellationToken)
         {
             var session = GetSessionForRemoteControl(sessionId);
 
+            var controllingSession = GetSession(controllingSessionId);
+            AssertCanControl(session, controllingSession);
+            
             return session.SessionController.SendMessageCommand(command, cancellationToken);
         }
 
-        /// <summary>
-        /// Sends the play command.
-        /// </summary>
-        /// <param name="sessionId">The session id.</param>
-        /// <param name="command">The command.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        public Task SendPlayCommand(Guid sessionId, PlayRequest command, CancellationToken cancellationToken)
+        public Task SendPlayCommand(Guid controllingSessionId, Guid sessionId, PlayRequest command, CancellationToken cancellationToken)
         {
             var session = GetSessionForRemoteControl(sessionId);
 
@@ -690,31 +675,27 @@ namespace MediaBrowser.Server.Implementations.Session
                 }
             }
 
+            var controllingSession = GetSession(controllingSessionId);
+            AssertCanControl(session, controllingSession);
+            if (controllingSession.UserId.HasValue)
+            {
+                command.ControllingUserId = controllingSession.UserId.Value.ToString("N");
+            }
+
             return session.SessionController.SendPlayCommand(command, cancellationToken);
         }
 
-        /// <summary>
-        /// Sends the browse command.
-        /// </summary>
-        /// <param name="sessionId">The session id.</param>
-        /// <param name="command">The command.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        public Task SendBrowseCommand(Guid sessionId, BrowseRequest command, CancellationToken cancellationToken)
+        public Task SendBrowseCommand(Guid controllingSessionId, Guid sessionId, BrowseRequest command, CancellationToken cancellationToken)
         {
             var session = GetSessionForRemoteControl(sessionId);
 
+            var controllingSession = GetSession(controllingSessionId);
+            AssertCanControl(session, controllingSession);
+            
             return session.SessionController.SendBrowseCommand(command, cancellationToken);
         }
 
-        /// <summary>
-        /// Sends the playstate command.
-        /// </summary>
-        /// <param name="sessionId">The session id.</param>
-        /// <param name="command">The command.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        public Task SendPlaystateCommand(Guid sessionId, PlaystateRequest command, CancellationToken cancellationToken)
+        public Task SendPlaystateCommand(Guid controllingSessionId, Guid sessionId, PlaystateRequest command, CancellationToken cancellationToken)
         {
             var session = GetSessionForRemoteControl(sessionId);
 
@@ -723,9 +704,28 @@ namespace MediaBrowser.Server.Implementations.Session
                 throw new ArgumentException(string.Format("Session {0} is unable to seek.", session.Id));
             }
 
+            var controllingSession = GetSession(controllingSessionId);
+            AssertCanControl(session, controllingSession);
+            if (controllingSession.UserId.HasValue)
+            {
+                command.ControllingUserId = controllingSession.UserId.Value.ToString("N");
+            }
+
             return session.SessionController.SendPlaystateCommand(command, cancellationToken);
         }
 
+        private void AssertCanControl(SessionInfo session, SessionInfo controllingSession)
+        {
+            if (session == null)
+            {
+                throw new ArgumentNullException("session");
+            }
+            if (controllingSession == null)
+            {
+                throw new ArgumentNullException("controllingSession");
+            }
+        }
+
         /// <summary>
         /// Sends the restart required message.
         /// </summary>