From 3d70e55368d91711f3b29d4e8fe5b65b5dcd4888 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 29 Aug 2013 17:00:27 -0400 Subject: [PATCH] added IsMuted to playback progress --- ApiClient.js | 8 ++++++-- dashboard-ui/scripts/mediaplayer.js | 2 +- packages.config | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ApiClient.js b/ApiClient.js index 6262d760ec..8666006f54 100644 --- a/ApiClient.js +++ b/ApiClient.js @@ -3354,7 +3354,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { * @param {String} userId * @param {String} itemId */ - self.reportPlaybackProgress = function (userId, itemId, positionTicks, isPaused) { + self.reportPlaybackProgress = function (userId, itemId, positionTicks, isPaused, isMuted) { if (!userId) { throw new Error("null userId"); @@ -3368,13 +3368,17 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { var deferred = $.Deferred(); - self.sendWebSocketMessage("PlaybackProgress", itemId + "|" + (positionTicks == null ? "" : positionTicks) + "|" + (isPaused == null ? "" : isPaused)); + var msgData = itemId + "|" + (positionTicks == null ? "" : positionTicks) + "|" + (isPaused == null ? "" : isPaused) + "|" + (isMuted == null ? "" : isMuted); + + self.sendWebSocketMessage("PlaybackProgress", msgData;); deferred.resolveWith(null, []); return deferred.promise(); } var params = { + isPaused: isPaused, + isMuted: isMuted }; if (positionTicks) { diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index d0173757a0..85f84951e3 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -134,7 +134,7 @@ function sendProgressUpdate(itemId) { - ApiClient.reportPlaybackProgress(Dashboard.getCurrentUserId(), itemId, getCurrentTicks(), currentMediaElement.paused); + ApiClient.reportPlaybackProgress(Dashboard.getCurrentUserId(), itemId, getCurrentTicks(), currentMediaElement.paused, currentMediaElement.volume == 0); } function clearProgressInterval() { diff --git a/packages.config b/packages.config index 9f7b690af2..94873bf7d9 100644 --- a/packages.config +++ b/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file