Don't report stopped playback if changing stream

jellyfin · Nov 4, 2024 · 3cd9151 · 3cd9151
1 parent 1a59aa2
commit 3cd9151
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/src/components/maincontroller.ts b/src/components/maincontroller.ts
@@ -194,14 +194,19 @@ window.playerManager.addEventListener(
     (mediaFinishedEvent): void => {
         const playbackState = PlaybackManager.playbackState;
 
-        reportPlaybackStopped(playbackState, {
-            ...getReportingParams(playbackState),
-            PositionTicks:
-                (mediaFinishedEvent.currentMediaTime ??
-                    getCurrentPositionTicks(playbackState)) * TicksPerSecond
-        });
+        // Don't notify server or client if changing streams, but notify next time.
+        if (!playbackState.isChangingStream) {
+            reportPlaybackStopped(playbackState, {
+                ...getReportingParams(playbackState),
+                PositionTicks:
+                    (mediaFinishedEvent.currentMediaTime ??
+                        getCurrentPositionTicks(playbackState)) * TicksPerSecond
+            });
 
-        defaultOnStop();
+            defaultOnStop();
+        } else {
+            playbackState.isChangingStream = false;
+        }
     }
 );
 
@@ -511,6 +516,8 @@ export async function changeStream(
     //    await stopActiveEncodings($scope.playSessionId);
     //}
 
+    state.isChangingStream = true;
+
     // @ts-expect-error is possible here
     return await PlaybackManager.playItemInternal(state.item, {
         audioStreamIndex: params.AudioStreamIndex ?? state.audioStreamIndex,

diff --git a/src/components/playbackManager.ts b/src/components/playbackManager.ts
@@ -194,7 +194,6 @@ export abstract class PlaybackManager {
         item: BaseItemDto,
         options: any // eslint-disable-line @typescript-eslint/no-explicit-any
     ): Promise<void> {
-        this.playbackState.isChangingStream = false;
         DocumentManager.setAppStatus(AppStatus.Loading);
 
         const maxBitrate = await getMaxBitrate();
@@ -286,7 +285,10 @@ export abstract class PlaybackManager {
             loadRequestData.currentTime = ticksToSeconds(startPositionTicks);
         }
 
+        const isChangingStream = this.playbackState.isChangingStream;
+
         load(mediaInfo.customData, item);
+        this.playbackState.isChangingStream = isChangingStream;
         this.playerManager.load(loadRequestData);
 
         this.playbackState.PlaybackMediaSource = mediaSource;