Merge remote-tracking branch 'upstream/master'

3 files changed, 32 insertions, 13 deletions

diff --git a/MediaBrowser.Model/Session/GeneralCommand.cs b/MediaBrowser.Model/Session/GeneralCommand.cs
index 0de7d6dd8..a50c3b5fe 100644
--- a/MediaBrowser.Model/Session/GeneralCommand.cs
+++ b/MediaBrowser.Model/Session/GeneralCommand.cs
@@ -43,6 +43,9 @@ namespace MediaBrowser.Model.Session
         VolumeDown = 18,
         Mute = 19,
         Unmute = 20,
-        ToggleMute = 21
+        ToggleMute = 21,
+        SetVolume = 22,
+        SetAudioStreamIndex = 23,
+        SetSubtitleStreamIndex = 24
     }
 }
diff --git a/MediaBrowser.Model/Session/PlaybackReports.cs b/MediaBrowser.Model/Session/PlaybackReports.cs
index 75dd3346c..b2361b876 100644
--- a/MediaBrowser.Model/Session/PlaybackReports.cs
+++ b/MediaBrowser.Model/Session/PlaybackReports.cs
@@ -16,6 +16,10 @@ namespace MediaBrowser.Model.Session
 
         public string[] QueueableMediaTypes { get; set; }
 
+        public int? AudioStreamIndex { get; set; }
+
+        public int? SubtitleStreamIndex { get; set; }
+
         public PlaybackStartInfo()
         {
             QueueableMediaTypes = new string[] { };
@@ -38,6 +42,12 @@ namespace MediaBrowser.Model.Session
         public bool IsPaused { get; set; }
 
         public bool IsMuted { get; set; }
+
+        public int? AudioStreamIndex { get; set; }
+
+        public int? SubtitleStreamIndex { get; set; }
+
+        public int? VolumeLevel { get; set; }
     }
 
     /// <summary>
diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs
index 5349a6360..4c51070ee 100644
--- a/MediaBrowser.Model/Session/SessionInfoDto.cs
+++ b/MediaBrowser.Model/Session/SessionInfoDto.cs
@@ -112,6 +112,24 @@ namespace MediaBrowser.Model.Session
         public string DeviceName { get; set; }
 
         /// <summary>
+        /// Gets or sets the volume level.
+        /// </summary>
+        /// <value>The volume level.</value>
+        public int? VolumeLevel { get; set; }
+
+        /// <summary>
+        /// Gets or sets the index of the now playing audio stream.
+        /// </summary>
+        /// <value>The index of the now playing audio stream.</value>
+        public int? NowPlayingAudioStreamIndex { get; set; }
+
+        /// <summary>
+        /// Gets or sets the index of the now playing subtitle stream.
+        /// </summary>
+        /// <value>The index of the now playing subtitle stream.</value>
+        public int? NowPlayingSubtitleStreamIndex { get; set; }
+
+        /// <summary>
         /// Gets or sets a value indicating whether this instance is paused.
         /// </summary>
         /// <value><c>true</c> if this instance is paused; otherwise, <c>false</c>.</value>
@@ -140,12 +158,6 @@ namespace MediaBrowser.Model.Session
         /// </summary>
         /// <value>The device id.</value>
         public string DeviceId { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [supports fullscreen toggle].
-        /// </summary>
-        /// <value><c>true</c> if [supports fullscreen toggle]; otherwise, <c>false</c>.</value>
-        public bool SupportsFullscreenToggle { get; set; }
         
         /// <summary>
         /// Gets or sets a value indicating whether [supports remote control].
@@ -154,12 +166,6 @@ namespace MediaBrowser.Model.Session
         public bool SupportsRemoteControl { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether [supports osd toggle].
-        /// </summary>
-        /// <value><c>true</c> if [supports osd toggle]; otherwise, <c>false</c>.</value>
-        public bool SupportsOsdToggle { 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>