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

3 files changed, 11 insertions, 11 deletions

diff --git a/MediaBrowser.Model/Session/GeneralCommand.cs b/MediaBrowser.Model/Session/GeneralCommand.cs
index a50c3b5fe..b75b49e92 100644
--- a/MediaBrowser.Model/Session/GeneralCommand.cs
+++ b/MediaBrowser.Model/Session/GeneralCommand.cs
@@ -46,6 +46,8 @@ namespace MediaBrowser.Model.Session
         ToggleMute = 21,
         SetVolume = 22,
         SetAudioStreamIndex = 23,
-        SetSubtitleStreamIndex = 24
+        SetSubtitleStreamIndex = 24,
+        ToggleFullscreen = 25,
+        DisplayContent = 26
     }
 }
diff --git a/MediaBrowser.Model/Session/PlaystateCommand.cs b/MediaBrowser.Model/Session/PlaystateCommand.cs
index 91572ba62..6466c6485 100644
--- a/MediaBrowser.Model/Session/PlaystateCommand.cs
+++ b/MediaBrowser.Model/Session/PlaystateCommand.cs
@@ -31,10 +31,6 @@ namespace MediaBrowser.Model.Session
         /// </summary>
         Seek,
         /// <summary>
-        /// The fullscreen
-        /// </summary>
-        Fullscreen,
-        /// <summary>
         /// The rewind
         /// </summary>
         Rewind,
diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs
index 4c51070ee..3754b07c7 100644
--- a/MediaBrowser.Model/Session/SessionInfoDto.cs
+++ b/MediaBrowser.Model/Session/SessionInfoDto.cs
@@ -52,6 +52,12 @@ namespace MediaBrowser.Model.Session
         public string UserId { get; set; }
 
         /// <summary>
+        /// Gets or sets the user primary image tag.
+        /// </summary>
+        /// <value>The user primary image tag.</value>
+        public Guid? UserPrimaryImageTag { get; set; }
+        
+        /// <summary>
         /// Gets or sets the name of the user.
         /// </summary>
         /// <value>The name of the user.</value>
@@ -164,12 +170,6 @@ namespace MediaBrowser.Model.Session
         /// </summary>
         /// <value><c>true</c> if [supports remote control]; otherwise, <c>false</c>.</value>
         public bool SupportsRemoteControl { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [supports navigation commands].
-        /// </summary>
-        /// <value><c>true</c> if [supports navigation commands]; otherwise, <c>false</c>.</value>
-        public bool SupportsNavigationControl { get; set; }
         
         public event PropertyChangedEventHandler PropertyChanged;
 
@@ -203,10 +203,12 @@ namespace MediaBrowser.Model.Session
     public class ClientCapabilities
     {
         public List<string> PlayableMediaTypes { get; set; }
+        public List<string> SupportedCommands { get; set; }
 
         public ClientCapabilities()
         {
             PlayableMediaTypes = new List<string>();
+            SupportedCommands = new List<string>();
         }
     }
 }