Skip to content

Commit 41cf05b

Browse files
authored
Merge pull request #96 from Stremio/feat/tracks-labels
feat: return tracks labels
2 parents 54b3930 + aba3de2 commit 41cf05b

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

src/HTMLVideo/HTMLVideo.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ function HTMLVideo(options) {
189189
return Object.freeze({
190190
id: 'EMBEDDED_' + String(index),
191191
lang: track.language,
192-
label: track.label,
192+
label: track.label || null,
193193
origin: 'EMBEDDED',
194194
embedded: true
195195
});

src/TitanVideo/TitanVideo.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ function TitanVideo(options) {
192192
return Object.freeze({
193193
id: 'EMBEDDED_' + String(index),
194194
lang: track.language,
195-
label: track.label || track.language,
195+
label: track.label || null,
196196
origin: 'EMBEDDED',
197197
embedded: true
198198
});
@@ -265,7 +265,7 @@ function TitanVideo(options) {
265265
return Object.freeze({
266266
id: 'EMBEDDED_' + String(index),
267267
lang: track.language,
268-
label: track.label || track.language,
268+
label: track.label || null,
269269
origin: 'EMBEDDED',
270270
embedded: true
271271
});

src/TizenVideo/TizenVideo.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -244,18 +244,20 @@ function TizenVideo(options) {
244244
extra = JSON.parse(textTrack.extra_info);
245245
} catch(e) {}
246246
var textTrackLang = typeof extra.track_lang === 'string' && extra.track_lang.length > 0 ? extra.track_lang.trim() : null;
247+
var textTrackLabel = null;
247248
if (((tracksData || {}).subs || []).length) {
248249
var extendedTrackData = tracksData.subs.find(function(el) {
249250
return (el || {}).id-1 === textTrack.index;
250251
});
251252
if (extendedTrackData) {
252253
textTrackLang = extendedTrackData.lang || 'eng';
254+
textTrackLabel = extendedTrackData.label || null;
253255
}
254256
}
255257
textTracks.push({
256258
id: textTrackId,
257259
lang: textTrackLang,
258-
label: textTrackLang,
260+
label: textTrackLabel,
259261
origin: 'EMBEDDED',
260262
embedded: true,
261263
mode: !disabledSubs && textTrackId === currentSubTrack ? 'showing' : 'disabled',
@@ -346,18 +348,20 @@ function TizenVideo(options) {
346348
extra = JSON.parse(audioTrack.extra_info);
347349
} catch(e) {}
348350
var audioTrackLang = typeof extra.language === 'string' && extra.language.length > 0 ? extra.language : null;
351+
var audioTrackLabel = null;
349352
if (((tracksData || {}).audio || []).length) {
350353
var extendedTrackData = tracksData.audio.find(function(el) {
351354
return (el || {}).id-1 === audioTrack.index;
352355
});
353356
if (extendedTrackData) {
354357
audioTrackLang = extendedTrackData.lang || 'eng';
358+
audioTrackLabel = extendedTrackData.label || null;
355359
}
356360
}
357361
audioTracks.push({
358362
id: audioTrackId,
359363
lang: audioTrackLang,
360-
label: audioTrackLang,
364+
label: audioTrackLabel,
361365
origin: 'EMBEDDED',
362366
embedded: true,
363367
mode: audioTrackId === currentAudioTrack ? 'showing' : 'disabled',

src/WebOsVideo/WebOsVideo.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ function WebOsVideo(options) {
370370
textTracks.push({
371371
id: 'EMBEDDED_' + textTrackId,
372372
lang: track.lang || 'eng',
373-
label: track.lang || 'eng',
373+
label: track.label || null,
374374
origin: 'EMBEDDED',
375375
embedded: true,
376376
mode: textTrackId === currentSubTrack ? 'showing' : 'disabled',
@@ -392,7 +392,7 @@ function WebOsVideo(options) {
392392
audioTracks.push({
393393
id: 'EMBEDDED_' + audioTrackId,
394394
lang: track.lang || 'eng',
395-
label: track.lang || 'eng',
395+
label: track.label || null,
396396
origin: 'EMBEDDED',
397397
embedded: true,
398398
mode: audioTrackId === currentAudioTrack ? 'showing' : 'disabled',

0 commit comments

Comments
 (0)