mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Fix stream selection remembering

Browse source
This commit is contained in:
Shadowghost 2022-06-19 14:55:21 +02:00
parent c8590d37ed
commit 2b0091eca2
5 changed files with 37 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/components/playback/playbackmanager.js
View file

@ -2300,7 +2300,7 @@ class PlaybackManager {
}
}
function autoSetNextTracks(prevSource, mediaSource) {
function autoSetNextTracks(prevSource, mediaSource, audio, subtitle) {
try {
if (!prevSource) return;
@ -2319,8 +2319,11 @@ class PlaybackManager {
return;
}
rankStreamType(prevSource.DefaultAudioStreamIndex, prevSource, mediaSource, 'Audio');
rankStreamType(prevSource.DefaultSubtitleStreamIndex, prevSource, mediaSource, 'Subtitle');
if (audio)
rankStreamType(prevSource.DefaultAudioStreamIndex, prevSource, mediaSource, 'Audio');
if (subtitle)
rankStreamType(prevSource.DefaultSubtitleStreamIndex, prevSource, mediaSource, 'Subtitle');
} catch (e) {
console.error(`AutoSet - Caught unexpected error: ${e}`);
}
@ -2385,8 +2388,18 @@ class PlaybackManager {
playOptions.items = null;
return getPlaybackMediaSource(player, apiClient, deviceProfile, maxBitrate, item, startPosition, mediaSourceId, audioStreamIndex, subtitleStreamIndex).then(function (mediaSource) {
if (userSettings.enableSetUsingLastTracks())
autoSetNextTracks(prevSource, mediaSource);
const user = apiClient.getCurrentUser();
if (user.Configuration.RememberAudioSelections) {
if (user.Configuration.RememberSubtitleSelections)
autoSetNextTracks(prevSource, mediaSource, true, true);
else
autoSetNextTracks(prevSource, mediaSource, true, false);
} else {
if (user.Configuration.RememberSubtitleSelections)
autoSetNextTracks(prevSource, mediaSource, false, true);
else
autoSetNextTracks(prevSource, mediaSource, false, false);
}
const streamInfo = createStreamInfo(apiClient, item.MediaType, item, mediaSource, startPosition, player);