Merge pull request jellyfin#4891 from Sky-High/playback-fixes-for-chr…

…omecast Fix playback control issues with chromecast
Sky-High · Nov 8, 2023 · 3421261 · 3421261
2 parents bd54821 + e51ab7a
commit 3421261
Show file tree

Hide file tree

Showing 5 changed files with 116 additions and 68 deletions.
diff --git a/src/components/nowPlayingBar/nowPlayingBar.js b/src/components/nowPlayingBar/nowPlayingBar.js
@@ -170,17 +170,20 @@ function bindEvents(elem) {
 
     elem.querySelector('.previousTrackButton').addEventListener('click', function (e) {
         if (currentPlayer) {
-            if (lastPlayerState.NowPlayingItem.MediaType === 'Audio') {
+            if (playbackManager.isPlayingAudio(currentPlayer)) {
                 // Cancel this event if doubleclick is fired. The actual previousTrack will be processed by the 'dblclick' event
                 if (e.detail > 1 ) {
                     return;
                 }
+
                 // Return to start of track, unless we are already (almost) at the beginning. In the latter case, continue and move
                 // to the previous track, unless we are at the first track so no previous track exists.
-                if (currentPlayer._currentTime >= 5 || playbackManager.getCurrentPlaylistIndex(currentPlayer) <= 1) {
+                // currentTime is in msec.
+
+                if (playbackManager.currentTime(currentPlayer) >= 5 || playbackManager.getCurrentPlaylistIndex(currentPlayer) <= 1) {
                     playbackManager.seekPercent(0, currentPlayer);
                     // This is done automatically by playbackManager, however, setting this here gives instant visual feedback.
-                    // TODO: Check why seekPercentage doesn't reflect the changes inmmediately, so we can remove this workaround.
+                    // TODO: Check why seekPercent doesn't reflect the changes inmmediately, so we can remove this workaround.
                     positionSlider.value = 0;
                     return;
                 }
@@ -574,7 +577,8 @@ function updateNowPlayingInfo(state) {
                         itemContextMenu.show(Object.assign({
                             item: item,
                             user: user
-                        }, options));
+                        }, options))
+                            .catch(() => { /* no-op */ });
                     });
                 });
             }
@@ -642,7 +646,8 @@ function hideNowPlayingBar() {
 }
 
 function onPlaybackStopped(e, state) {
-    console.debug('nowplaying event: ' + e.type);
+    console.debug('[nowPlayingBar:onPlaybackStopped] event: ' + e.type);
+
     const player = this;
 
     if (player.isLocalPlayer) {
@@ -669,7 +674,7 @@ function onStateChanged(event, state) {
         return;
     }
 
-    console.debug('nowplaying event: ' + event.type);
+    console.debug('[nowPlayingBar:onStateChanged] event: ' + event.type);
     const player = this;
 
     if (!state.NowPlayingItem || layoutManager.tv || state.IsFullscreen === false) {
@@ -792,4 +797,3 @@ document.addEventListener('viewbeforeshow', function (e) {
         }
     }
 });
-
diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
@@ -223,7 +223,8 @@ function updateNowPlayingInfo(context, state, serverId) {
                     itemContextMenu.show(Object.assign({
                         item: fullItem,
                         user: user
-                    }, options));
+                    }, options))
+                        .catch(() => { /* no-op */ });
                 });
             });
         });
@@ -773,17 +774,20 @@ export default function () {
 
         context.querySelector('.btnPreviousTrack').addEventListener('click', function (e) {
             if (currentPlayer) {
-                if (lastPlayerState.NowPlayingItem.MediaType === 'Audio') {
+                if (playbackManager.isPlayingAudio(currentPlayer)) {
                     // Cancel this event if doubleclick is fired. The actual previousTrack will be processed by the 'dblclick' event
                     if (e.detail > 1 ) {
                         return;
                     }
+
                     // Return to start of track, unless we are already (almost) at the beginning. In the latter case, continue and move
                     // to the previous track, unless we are at the first track so no previous track exists.
-                    if (currentPlayer._currentTime >= 5 || playbackManager.getCurrentPlaylistIndex(currentPlayer) <= 1) {
+                    // currentTime is in msec.
+
+                    if (playbackManager.currentTime(currentPlayer) >= 5 || playbackManager.getCurrentPlaylistIndex(currentPlayer) <= 1) {
                         playbackManager.seekPercent(0, currentPlayer);
                         // This is done automatically by playbackManager, however, setting this here gives instant visual feedback.
-                        // TODO: Check why seekPercentage doesn't reflect the changes inmmediately, so we can remove this workaround.
+                        // TODO: Check why seekPercent doesn't reflect the changes inmmediately, so we can remove this workaround.
                         positionSlider.value = 0;
                         return;
                     }

diff --git a/src/components/shortcuts.js b/src/components/shortcuts.js
@@ -121,14 +121,15 @@ function showContextMenu(card, options) {
                     playlistId: playlistId,
                     collectionId: collectionId,
                     user: user
-
-                }, options || {})).then(result => {
-                    if (result.command === 'playallfromhere' || result.command === 'queueallfromhere') {
-                        executeAction(card, options.positionTo, result.command);
-                    } else if (result.updated || result.deleted) {
-                        notifyRefreshNeeded(card, options.itemsContainer);
-                    }
-                });
+                }, options || {}))
+                    .then(result => {
+                        if (result.command === 'playallfromhere' || result.command === 'queueallfromhere') {
+                            executeAction(card, options.positionTo, result.command);
+                        } else if (result.updated || result.deleted) {
+                            notifyRefreshNeeded(card, options.itemsContainer);
+                        }
+                    })
+                    .catch(() => { /* no-op */ });
             });
         });
     });

diff --git a/src/controllers/itemDetails/index.js b/src/controllers/itemDetails/index.js
@@ -1966,13 +1966,15 @@ export default function (view, params) {
             selectedItem = item;
 
             apiClient.getCurrentUser().then(function (user) {
-                itemContextMenu.show(getContextMenuOptions(selectedItem, user, button)).then(function (result) {
-                    if (result.deleted) {
-                        appRouter.goHome();
-                    } else if (result.updated) {
-                        reload(self, view, params);
-                    }
-                });
+                itemContextMenu.show(getContextMenuOptions(selectedItem, user, button))
+                    .then(function (result) {
+                        if (result.deleted) {
+                            appRouter.goHome();
+                        } else if (result.updated) {
+                            reload(self, view, params);
+                        }
+                    })
+                    .catch(() => { /* no-op */ });
             });
         });
     }