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: use correct stream, code safety, race conditions, update css

Browse source
This commit is contained in:
Ivan Schurawel 2022-11-14 22:29:30 -05:00 • committed by Ivan Schurawel
parent f3865f0dac
commit b1e397c4bc
4 changed files with 22 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -911,7 +911,7 @@ class PlaybackManager {
return null;
}
return getSubtitleStream(player, index);
return self.getSubtitleStream(player, index);
}
function getCurrentSecondarySubtitleStream(player) {
@ -925,14 +925,14 @@ class PlaybackManager {
return null;
}
return getSubtitleStream(player, index);
return self.getSubtitleStream(player, index);
}
function getSubtitleStream(player, index) {
self.getSubtitleStream = function (player, index) {
return self.subtitleTracks(player).filter(function (s) {
return s.Type === 'Subtitle' && s.Index === index;
})[0];
}
};
self.getPlaylist = function (player) {
player = player || self._currentPlayer;
@ -1536,7 +1536,7 @@ class PlaybackManager {
const currentStream = getCurrentSubtitleStream(player);
const newStream = getSubtitleStream(player, index);
const newStream = self.getSubtitleStream(player, index);
if (!currentStream && !newStream) {
return;
@ -1581,7 +1581,7 @@ class PlaybackManager {
// Also disable secondary subtitles when disabling the primary
// subtitles, or if it doesn't support a secondary pair
if (selectedTrackElementIndex === -1 || !self.trackHasSecondarySubtitleSupport(newStream)) {
self.setSecondarySubtitleStreamIndex(selectedTrackElementIndex);
self.setSecondarySubtitleStreamIndex(-1);
}
getPlayerData(player).subtitleStreamIndex = index;
@ -1600,7 +1600,7 @@ class PlaybackManager {
const currentStream = getCurrentSecondarySubtitleStream(player);
const newStream = getSubtitleStream(player, index);
const newStream = self.getSubtitleStream(player, index);
if (!currentStream && !newStream) {
return;
@ -1644,7 +1644,7 @@ class PlaybackManager {
};
self.isSubtitleStreamExternal = function (index, player) {
const stream = getSubtitleStream(player, index);
const stream = self.getSubtitleStream(player, index);
return stream ? getDeliveryMethod(stream) === 'External' : false;
};