Only specify mediaSourceId if index changed

viown · viown · commit 4e2a3deb1d31 · 2024-10-05T09:56:06.000+03:00
diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
@@ -2573,7 +2573,7 @@ export class PlaybackManager {
             }
 
             const apiClient = ServerConnections.getApiClient(item.ServerId);
-            const mediaSourceId = playOptions.mediaSourceId;
+            let mediaSourceId = playOptions.mediaSourceId;
             const getMediaStreams = apiClient.getItem(apiClient.getCurrentUserId(), mediaSourceId || item.Id)
                 .then(fullItem => {
                     return fullItem.MediaStreams;
@@ -2611,9 +2611,11 @@ export class PlaybackManager {
                 autoSetNextTracks(prevSource, mediaStreams, trackOptions, user.Configuration.RememberAudioSelections, user.Configuration.RememberSubtitleSelections);
                 if (trackOptions.DefaultAudioStreamIndex != null) {
                     options.audioStreamIndex = trackOptions.DefaultAudioStreamIndex;
+                    mediaSourceId = playOptions.mediaSourceId || item.Id;
                 }
                 if (trackOptions.DefaultSubtitleStreamIndex != null) {
                     options.subtitleStreamIndex = trackOptions.DefaultSubtitleStreamIndex;
+                    mediaSourceId = playOptions.mediaSourceId || item.Id;
                 }
 
                 return getPlaybackMediaSource(player, apiClient, deviceProfile, item, mediaSourceId, options).then(async (mediaSource) => {

Original file line number	Diff line number	Diff line change
`@@ -2573,7 +2573,7 @@ export class PlaybackManager {`
`2573`	`2573`	`}`
`2574`	`2574`
`2575`	`2575`	`const apiClient = ServerConnections.getApiClient(item.ServerId);`
`2576`		`- const mediaSourceId = playOptions.mediaSourceId;`
	`2576`	`+ let mediaSourceId = playOptions.mediaSourceId;`
`2577`	`2577`	`const getMediaStreams = apiClient.getItem(apiClient.getCurrentUserId(), mediaSourceId \|\| item.Id)`
`2578`	`2578`	`.then(fullItem => {`
`2579`	`2579`	`return fullItem.MediaStreams;`
`@@ -2611,9 +2611,11 @@ export class PlaybackManager {`
`2611`	`2611`	`autoSetNextTracks(prevSource, mediaStreams, trackOptions, user.Configuration.RememberAudioSelections, user.Configuration.RememberSubtitleSelections);`
`2612`	`2612`	`if (trackOptions.DefaultAudioStreamIndex != null) {`
`2613`	`2613`	`options.audioStreamIndex = trackOptions.DefaultAudioStreamIndex;`
	`2614`	`+ mediaSourceId = playOptions.mediaSourceId \|\| item.Id;`
`2614`	`2615`	`}`
`2615`	`2616`	`if (trackOptions.DefaultSubtitleStreamIndex != null) {`
`2616`	`2617`	`options.subtitleStreamIndex = trackOptions.DefaultSubtitleStreamIndex;`
	`2618`	`+ mediaSourceId = playOptions.mediaSourceId \|\| item.Id;`
`2617`	`2619`	`}`
`2618`	`2620`
`2619`	`2621`	`return getPlaybackMediaSource(player, apiClient, deviceProfile, item, mediaSourceId, options).then(async (mediaSource) => {`