progress on remote control

3 files changed, 33 insertions, 3 deletions

diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index a0892060ff..56c7b99f9f 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -206,7 +206,7 @@ namespace MediaBrowser.WebDashboard.Api
             ILibraryManager libraryManager,
             ISessionManager connectionManager)
         {
-            var connections = connectionManager.RecentConnections.ToArray();
+            var connections = connectionManager.Sessions.Where(i => i.IsActive).ToArray();
 
             var dtoBuilder = new UserDtoBuilder(logger);
 
diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js
index 2982a40a9d..999a7d9180 100644
--- a/MediaBrowser.WebDashboard/ApiClient.js
+++ b/MediaBrowser.WebDashboard/ApiClient.js
@@ -2379,6 +2379,16 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
                 throw new Error("null itemId");
             }
 
+            if (self.isWebSocketOpen()) {
+
+                var deferred = $.Deferred();
+
+                self.sendWebSocketMessage("PlaybackStart", itemId);
+
+                deferred.resolveWith(null, []);
+                return deferred.promise();
+            }
+
             var url = self.getUrl("Users/" + userId + "/PlayingItems/" + itemId);
 
             return self.ajax({
@@ -2392,7 +2402,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
          * @param {String} userId
          * @param {String} itemId
          */
-        self.reportPlaybackProgress = function (userId, itemId, positionTicks) {
+        self.reportPlaybackProgress = function (userId, itemId, positionTicks, isPaused) {
 
             if (!userId) {
                 throw new Error("null userId");
@@ -2402,6 +2412,16 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
                 throw new Error("null itemId");
             }
 
+            if (self.isWebSocketOpen()) {
+
+                var deferred = $.Deferred();
+
+                self.sendWebSocketMessage("PlaybackProgress", itemId + "|" + (positionTicks == null ? "" : positionTicks) + "|" + (isPaused == null ? "" : isPaused));
+
+                deferred.resolveWith(null, []);
+                return deferred.promise();
+            }
+
             var params = {
             };
 
@@ -2433,6 +2453,16 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
                 throw new Error("null itemId");
             }
 
+            if (self.isWebSocketOpen()) {
+
+                var deferred = $.Deferred();
+
+                self.sendWebSocketMessage("PlaybackStopped", itemId + "|" + (positionTicks == null ? "" : positionTicks));
+
+                deferred.resolveWith(null, []);
+                return deferred.promise();
+            }
+
             var params = {
             };
 
diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config
index 8072ff77df..be16737802 100644
--- a/MediaBrowser.WebDashboard/packages.config
+++ b/MediaBrowser.WebDashboard/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.101" targetFramework="net45" />
+  <package id="MediaBrowser.ApiClient.Javascript" version="3.0.104" targetFramework="net45" />
   <package id="ServiceStack.Common" version="3.9.44" targetFramework="net45" />
   <package id="ServiceStack.Text" version="3.9.44" targetFramework="net45" />
 </packages>
\ No newline at end of file