Merge remote-tracking branch 'upstream/master'

6 files changed, 26 insertions, 10 deletions

diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index aba7e217e..379e757bb 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/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.
diff --git a/MediaBrowser.Model/Dto/MediaVersionInfo.cs b/MediaBrowser.Model/Dto/MediaVersionInfo.cs
index dfbf81416..3da5e2b8d 100644
--- a/MediaBrowser.Model/Dto/MediaVersionInfo.cs
+++ b/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; }
     }
 }
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 12a462589..6a7e723a7 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/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" />
diff --git a/MediaBrowser.Model/Session/BrowseRequest.cs b/MediaBrowser.Model/Session/BrowseRequest.cs
index e2cdcc1b2..bcf72e143 100644
--- a/MediaBrowser.Model/Session/BrowseRequest.cs
+++ b/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";
-    }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Session/SessionCapabilities.cs b/MediaBrowser.Model/Session/SessionCapabilities.cs
new file mode 100644
index 000000000..731ebaccc
--- /dev/null
+++ b/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[] {};
+        }
+    }
+}
diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs
index 083d1ef79..d44bbeaeb 100644
--- a/MediaBrowser.Model/Session/SessionInfoDto.cs
+++ b/MediaBrowser.Model/Session/SessionInfoDto.cs
@@ -136,6 +136,12 @@ namespace MediaBrowser.Model.Session
         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>
         /// <value><c>true</c> if [supports remote control]; otherwise, <c>false</c>.</value>