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

5 files changed, 26 insertions, 3 deletions

diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index a0e527a99..292489869 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -572,17 +572,18 @@ namespace MediaBrowser.Model.ApiClient
         /// Instructs antoher client to browse to a library item.
         /// </summary>
         /// <param name="sessionId">The session id.</param>
+        /// <param name="userId">The controlling user id.</param>
         /// <param name="itemId">The id of the item to browse to.</param>
         /// <param name="itemName">The name of the item to browse to.</param>
         /// <param name="itemType">The type of the item to browse to.</param>
         /// <param name="context">Optional ui context (movies, music, tv, games, etc). The client is free to ignore this.</param>
         /// <returns>Task.</returns>
-        Task SendBrowseCommandAsync(string sessionId, string itemId, string itemName, string itemType, string context);
+        Task SendBrowseCommandAsync(string sessionId, string userId, string itemId, string itemName, string itemType, string context);
 
         /// <summary>
         /// Sends the playstate command async.
         /// </summary>
-        /// <param name="sessionId">The session id.</param>
+        /// <param name="sessionId">The session id.</param>        
         /// <param name="request">The request.</param>
         /// <returns>Task.</returns>
         Task SendPlaystateCommandAsync(string sessionId, PlaystateRequest request);
diff --git a/MediaBrowser.Model/Session/BrowseRequest.cs b/MediaBrowser.Model/Session/BrowseRequest.cs
index abb3a30ab..03241860c 100644
--- a/MediaBrowser.Model/Session/BrowseRequest.cs
+++ b/MediaBrowser.Model/Session/BrowseRequest.cs
@@ -1,4 +1,6 @@
 
+using System;
+
 namespace MediaBrowser.Model.Session
 {
     /// <summary>
@@ -12,6 +14,8 @@ namespace MediaBrowser.Model.Session
         /// <value>The type of the item.</value>
         public string ItemType { get; set; }
 
+        public Guid UserId { get; set; }
+
         /// <summary>
         /// Gets or sets the item id.
         /// </summary>
diff --git a/MediaBrowser.Model/Session/MessageCommand.cs b/MediaBrowser.Model/Session/MessageCommand.cs
index 5ab580815..754c057fa 100644
--- a/MediaBrowser.Model/Session/MessageCommand.cs
+++ b/MediaBrowser.Model/Session/MessageCommand.cs
@@ -1,8 +1,11 @@
 
+using System;
 namespace MediaBrowser.Model.Session
 {
     public class MessageCommand
-    {
+    {       
+        public Guid UserId { get; set; }
+
         public string Header { get; set; }
         
         public string Text { get; set; }
diff --git a/MediaBrowser.Model/Session/PlayRequest.cs b/MediaBrowser.Model/Session/PlayRequest.cs
index c9bb58693..239fb6572 100644
--- a/MediaBrowser.Model/Session/PlayRequest.cs
+++ b/MediaBrowser.Model/Session/PlayRequest.cs
@@ -1,4 +1,5 @@
 
+using System;
 namespace MediaBrowser.Model.Session
 {
     /// <summary>
@@ -6,6 +7,11 @@ namespace MediaBrowser.Model.Session
     /// </summary>
     public class PlayRequest
     {
+        public PlayRequest()
+        {
+
+        }
+
         /// <summary>
         /// Gets or sets the item ids.
         /// </summary>
@@ -23,6 +29,12 @@ namespace MediaBrowser.Model.Session
         /// </summary>
         /// <value>The play command.</value>
         public PlayCommand PlayCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the play command.
+        /// </summary>
+        /// <value>The play command.</value>
+        public Guid UserId { get; set; }
     }
 
     /// <summary>
diff --git a/MediaBrowser.Model/Session/PlaystateCommand.cs b/MediaBrowser.Model/Session/PlaystateCommand.cs
index 7e85d9d27..68e80c452 100644
--- a/MediaBrowser.Model/Session/PlaystateCommand.cs
+++ b/MediaBrowser.Model/Session/PlaystateCommand.cs
@@ -1,4 +1,5 @@
 
+using System;
 namespace MediaBrowser.Model.Session
 {
     /// <summary>
@@ -34,6 +35,8 @@ namespace MediaBrowser.Model.Session
 
     public class PlaystateRequest
     {
+        public Guid UserId { get; set; }
+
         public PlaystateCommand Command { get; set; }
 
         public long? SeekPositionTicks { get; set; }