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

Jump to bottom

fix(demo): allow switch between UITextDisplayer and SimpleTextDisplayer #4275

Merged
merged 1 commit into from
Jun 7, 2022
Merged

fix(demo): allow switch between UITextDisplayer and SimpleTextDisplayer #4275

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions demo/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1233,9 +1233,6 @@ shakaDemo.Main = class {
// The currently-selected asset changed, so update asset cards.
this.dispatchEventWithName_('shaka-main-selected-asset-changed');

await this.drmConfiguration_(asset);
this.controls_.getCastProxy().setAppData({'asset': asset});

// Enable the correct set of controls before loading.
// The video container influences the TextDisplayer used.
if (this.nativeControlsEnabled_) {
Expand All @@ -1250,6 +1247,9 @@ shakaDemo.Main = class {
this.player_.setVideoContainer(this.container_);
}

await this.drmConfiguration_(asset);
this.controls_.getCastProxy().setAppData({'asset': asset});

// Finally, the asset can be loaded.
let manifestUri = asset.manifestUri;
// If we have an offline copy, use that. If the offlineUri field is null,
Expand Down