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

subtitle fixes

Browse source
This commit is contained in:
Luke Pulverenti 2016-02-24 11:52:36 -05:00
parent d854092d88
commit a434bf443d
2 changed files with 14 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
dashboard-ui/scripts/htmlmediarenderer.js
View file

@ -4,6 +4,7 @@
var hlsPlayer;
var requiresSettingStartTimeOnStart;
var subtitleTrackIndexToSetOnPlaying;
var currentTrackList;
function htmlMediaRenderer(options) {
@ -375,15 +376,12 @@
}
tracks = tracks || [];
currentTrackList = tracks;
var currentTrackIndex = -1;
for (var i = 0, length = tracks.length; i < length; i++) {
if (tracks[i].isDefault) {
if (browserInfo.msie) {
currentTrackIndex = i;
} else {
currentTrackIndex = tracks[i].index;
}
currentTrackIndex = tracks[i].index;
break;
}
}
@ -505,14 +503,19 @@
return supportsTextTracks;
};
self.setCurrentTrackElement = function (trackIndex) {
self.setCurrentTrackElement = function (streamIndex) {
console.log('Setting new text track index to: ' + trackIndex);
console.log('Setting new text track index to: ' + streamIndex);
var allTracks = mediaElement.textTracks; // get list of tracks
var modes = ['disabled', 'showing', 'hidden'];
var expectedId = 'textTrack' + trackIndex;
var expectedId = 'textTrack' + streamIndex;
var track = streamIndex == -1 ? null : currentTrackList.filter(function (t) {
return t.index == streamIndex;
})[0];
var trackIndex = streamIndex == -1 || !track ? -1 : currentTrackList.indexOf(track);
for (var i = 0; i < allTracks.length; i++) {
@ -522,6 +525,8 @@
var mode;
console.log('expectedId: ' + expectedId + '--currentTrack.Id:' + currentTrack.id);
// IE doesn't support track id
if (browserInfo.msie) {
if (trackIndex == i) {