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

Fixed #518

Browse source
This commit is contained in:
Daniel Hartung 2019-10-11 15:48:28 +02:00
parent adf7b1ae0c
commit 63f804df32
1 changed files with 33 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/components/htmlvideoplayer/plugin.js
View file

@ -1192,24 +1192,26 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
} }
var trackElement = null; var trackElement = null;
var expectedId = 'manualTrack' + track.Index; if (videoElement.textTracks && videoElement.textTracks.length > 0) {
trackElement = videoElement.textTracks[0];
// get list of tracks // This throws an error in IE, but is fine in chrome
var allTracks = videoElement.textTracks; // In IE it's not necessary anyway because changing the src seems to be enough
for (var i = 0; i < allTracks.length; i++) { try {
trackElement.mode = 'showing';
while (trackElement.cues.length) {
trackElement.removeCue(trackElement.cues[0]);
}
} catch (e) {
console.log('Error removing cue from textTrack');
}
var currentTrack = allTracks[i]; trackElement.mode = 'disabled';
if (currentTrack.label === expectedId) {
trackElement = currentTrack;
break;
} else { } else {
currentTrack.mode = 'disabled'; // There is a function addTextTrack but no function for removeTextTrack
// Therefore we add ONE element and replace its cue data
trackElement = videoElement.addTextTrack('subtitles', 'manualTrack', 'und');
} }
}
if (!trackElement) {
trackElement = videoElement.addTextTrack('subtitles', 'manualTrack' + track.Index, track.Language || 'und');
// download the track json // download the track json
fetchSubtitles(track, item).then(function (data) { fetchSubtitles(track, item).then(function (data) {
@ -1227,9 +1229,6 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
}); });
trackElement.mode = 'showing'; trackElement.mode = 'showing';
}); });
} else {
trackElement.mode = 'showing';
}
} }
function updateSubtitleText(timeMs) { function updateSubtitleText(timeMs) {