From 74d1ffd67689c5203870dbdbfa21a0e4d79f6db1 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 20 Mar 2014 23:31:40 -0400
Subject: fixes #712 - multi-version grouping

---
 MediaBrowser.Controller/Entities/Trailer.cs        | 4 +++-
 MediaBrowser.Controller/Session/ISessionManager.cs | 7 +++++++
 MediaBrowser.Controller/Session/SessionInfo.cs     | 6 ++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Entities/Trailer.cs b/MediaBrowser.Controller/Entities/Trailer.cs
index 2a09536c0..b3d73dc34 100644
--- a/MediaBrowser.Controller/Entities/Trailer.cs
+++ b/MediaBrowser.Controller/Entities/Trailer.cs
@@ -90,7 +90,9 @@ namespace MediaBrowser.Controller.Entities
 
             if (!string.IsNullOrWhiteSpace(key))
             {
-                return key + "-trailer";
+                key = key + "-trailer";
+
+                return key;
             }
 
             return base.GetUserDataKey();
diff --git a/MediaBrowser.Controller/Session/ISessionManager.cs b/MediaBrowser.Controller/Session/ISessionManager.cs
index 6ca15585a..459e43d08 100644
--- a/MediaBrowser.Controller/Session/ISessionManager.cs
+++ b/MediaBrowser.Controller/Session/ISessionManager.cs
@@ -180,5 +180,12 @@ namespace MediaBrowser.Controller.Session
         /// <param name="remoteEndPoint">The remote end point.</param>
         /// <returns>Task{SessionInfo}.</returns>
         Task<SessionInfo> AuthenticateNewSession(User user, string password, string clientType, string appVersion, string deviceId, string deviceName, string remoteEndPoint);
+
+        /// <summary>
+        /// Reports the capabilities.
+        /// </summary>
+        /// <param name="sessionId">The session identifier.</param>
+        /// <param name="capabilities">The capabilities.</param>
+        void ReportCapabilities(Guid sessionId, SessionCapabilities capabilities);
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs
index f84204d11..73e33d78c 100644
--- a/MediaBrowser.Controller/Session/SessionInfo.cs
+++ b/MediaBrowser.Controller/Session/SessionInfo.cs
@@ -155,6 +155,12 @@ namespace MediaBrowser.Controller.Session
         /// <value>The session controller.</value>
         public ISessionController SessionController { 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 a value indicating whether this instance is active.
         /// </summary>
-- 
cgit v1.2.3