Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(FEC-11697): 2 captions are selected in the menu #182

Merged
merged 9 commits into from
Sep 7, 2022
Merged

fix(FEC-11697): 2 captions are selected in the menu #182

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
754b18d
fix(FEC-11697): 2 captions are selected in the menu
Feb 10, 2022
6ac9a33
take the corresponding player for tests
Feb 10, 2022
c6ae5da
update playkit dependency
Feb 20, 2022
4cd503f
Merge branch 'master' into FEC-11697
JonathanTGold Feb 20, 2022
3581634
fix tests
Feb 20, 2022
a7fc053
Merge branch 'FEC-11697' of https://github.com/kaltura/playkit-js-das…
Feb 20, 2022
594a126
fix tests
Feb 20, 2022
a269eee
Merge branch 'master' into FEC-11697
JonathanTGold Aug 30, 2022
6c33ebc
Merge branch 'master' into FEC-11697
JonathanTGold Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"@babel/preset-env": "^7.10.4",
"@babel/preset-flow": "^7.10.4",
"@babel/register": "^7.10.5",
"@playkit-js/playkit-js": "canary",
"@playkit-js/playkit-js": "kaltura/playkit-js#FEC-11697",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.1.0",
"babel-plugin-istanbul": "^6.0.0",
Expand Down Expand Up @@ -104,7 +104,7 @@
"webpack-dev-server": "^3.11.0"
},
"peerDependencies": {
"@playkit-js/playkit-js": "canary",
"@playkit-js/playkit-js": "kaltura/playkit-js#FEC-11697",
"shaka-player": "3.3.0"
},
"publishConfig": {
Expand Down
24 changes: 10 additions & 14 deletions src/dash-adapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,21 +990,17 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
* @private
*/
_getParsedTextTracks(): Array<TextTrack> {
let textTracks = this._shaka.getTextTracks();
let parsedTracks = [];
if (textTracks) {
for (let i = 0; i < textTracks.length; i++) {
let kind = textTracks[i].kind ? textTracks[i].kind + 's' : '';
kind = kind === '' && this._config.useShakaTextTrackDisplay ? 'captions' : kind;
let settings = {
kind: kind,
active: false,
label: textTracks[i].label,
language: textTracks[i].language,
index: i
};
parsedTracks.push(new TextTrack(settings));
}
for (const textTrack of this._shaka.getTextTracks()) {
let kind = textTrack.kind ? textTrack.kind + 's' : '';
kind = kind === '' && this._config.useShakaTextTrackDisplay ? 'captions' : kind;
let settings = {
kind: kind,
active: false,
label: textTrack.label,
language: textTrack.language
};
parsedTracks.push(new TextTrack(settings));
}
return parsedTracks;
}
Expand Down