Skip to content

Commit 184400d

Browse files
committed
fix(TizenVideo): selectedSubtitlesTrackId logic
1 parent 977f194 commit 184400d

1 file changed

Lines changed: 16 additions & 22 deletions

File tree

src/TizenVideo/TizenVideo.js

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -463,32 +463,26 @@ function TizenVideo(options) {
463463
}
464464
case 'selectedSubtitlesTrackId': {
465465
if (stream !== null) {
466-
if ((currentSubTrack || '').indexOf('EMBEDDED_') === 0) {
467-
if ((propValue || '').indexOf('EMBEDDED_') === -1) {
468-
renderSubtitle(1, '');
469-
disabledSubs = true;
470-
onPropChanged('selectedSubtitlesTrackId');
471-
return;
472-
}
473-
disabledSubs = false;
466+
if ((propValue || '').indexOf('EMBEDDED_') === -1 || !propValue) {
467+
renderSubtitle(1, '');
468+
disabledSubs = true;
469+
onPropChanged('selectedSubtitlesTrackId');
470+
return;
471+
}
474472

475-
currentSubTrack = propValue;
473+
var subtitlesTracks = getProp('subtitlesTracks');
474+
var selectedSubtitlesTrack = subtitlesTracks
475+
.find(function(track) {
476+
return track.id === propValue;
477+
});
476478

477-
var subtitlesTracks = getProp('subtitlesTracks');
478-
var selectedSubtitlesTrack = subtitlesTracks
479-
.find(function(track) {
480-
return track.id === propValue;
481-
});
479+
if (selectedSubtitlesTrack) {
480+
disabledSubs = false;
481+
currentSubTrack = propValue;
482482

483-
AVPlay.setSelectTrack('TEXT', parseInt(currentSubTrack.replace('EMBEDDED_', '')));
483+
AVPlay.setSelectTrack('TEXT', parseInt(selectedSubtitlesTrack.id.replace('EMBEDDED_', '')));
484484

485-
if (selectedSubtitlesTrack) {
486-
events.emit('subtitlesTrackLoaded', selectedSubtitlesTrack);
487-
onPropChanged('selectedSubtitlesTrackId');
488-
}
489-
} else if (!propValue) {
490-
renderSubtitle(1, '');
491-
disabledSubs = true;
485+
events.emit('subtitlesTrackLoaded', selectedSubtitlesTrack);
492486
onPropChanged('selectedSubtitlesTrackId');
493487
}
494488
}

0 commit comments

Comments
 (0)