Merge remote-tracking branch 'upstream/master'

MediaBrowser.Model/Dto/BaseItemDto.cs

@@ -500,7 +500,7 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// <value>The part count.</value>
         public int? PartCount { get; set; }
-        public int? AlternateVersionCount { get; set; }
+        public int? MediaVersionCount { get; set; }
 
         /// <summary>
         /// Determines whether the specified type is type.

MediaBrowser.Model/Dto/MediaVersionInfo.cs

@@ -5,7 +5,7 @@ namespace MediaBrowser.Model.Dto
 {
     public class MediaVersionInfo
     {
-        public string Id { get; set; }
+        public string ItemId { get; set; }
 
         public string Path { get; set; }
 
@@ -24,5 +24,7 @@ namespace MediaBrowser.Model.Dto
         public List<MediaStream> MediaStreams { get; set; }
 
         public List<ChapterInfoDto> Chapters { get; set; }
+
+        public bool IsPrimaryVersion { get; set; }
     }
 }

MediaBrowser.Model/MediaBrowser.Model.csproj

@@ -166,6 +166,7 @@
     <Compile Include="Search\SearchHintResult.cs" />
     <Compile Include="Serialization\IJsonSerializer.cs" />
     <Compile Include="Serialization\IXmlSerializer.cs" />
+    <Compile Include="Session\SessionCapabilities.cs" />
     <Compile Include="Session\SessionInfoDto.cs" />
     <Compile Include="Session\SystemCommand.cs" />
     <Compile Include="Session\UserDataChangeInfo.cs" />

MediaBrowser.Model/Session/BrowseRequest.cs

@@ -32,12 +32,4 @@ namespace MediaBrowser.Model.Session
         /// <value>The context.</value>
         public string Context { get; set; }
     }
-
-    public class ItemContext
-    {
-        public const string Music = "Music";
-        public const string Movies = "Movies";
-        public const string TvShows = "TvShows";
-        public const string Games = "Games";
-    }
 }

MediaBrowser.Model/Session/SessionCapabilities.cs

@@ -0,0 +1,15 @@
+
+namespace MediaBrowser.Model.Session
+{
+    public class SessionCapabilities
+    {
+        public string[] PlayableMediaTypes { get; set; }
+
+        public bool SupportsFullscreenToggle { get; set; }
+
+        public SessionCapabilities()
+        {
+            PlayableMediaTypes = new string[] {};
+        }
+    }
+}

MediaBrowser.Model/Session/SessionInfoDto.cs

@@ -135,6 +135,12 @@ namespace MediaBrowser.Model.Session
         /// <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].
         /// </summary>