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.

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(demo): allow switch between UITextDisplayer and SimpleTextDisplayer #4275

Merged
merged 1 commit into from
Jun 7, 2022

Conversation

avelad
Copy link
Collaborator

@avelad avelad commented Jun 7, 2022

Closes #4209

@avelad avelad added type: bug Something isn't working correctly component: demo page The issue is in the demo page; does not affect production applications component: captions/subtitles The issue involves captions or subtitles labels Jun 7, 2022
@avelad avelad added this to the v4.2 milestone Jun 7, 2022
@avelad avelad merged commit 28689f3 into shaka-project:main Jun 7, 2022
@avelad avelad deleted the demo-text-displayer branch June 7, 2022 08:55
@theodab
Copy link
Collaborator

theodab commented Jun 7, 2022

shaka-player/demo/main.js

Lines 1163 to 1173 in 8719bdc

const assetConfig = asset.getConfiguration();
if (storage) {
storage.configure(assetConfig);
} else {
// Remove all not-player-applied configurations, by resetting the
// configuration then re-applying the desired configuration.
this.player_.resetConfiguration();
this.player_.configure(this.desiredConfig_);
this.player_.configure(assetConfig);
// This uses Player.configure so as to not change |this.desiredConfig_|.
}

Yeah, it looks like the demo config values are applied to the player inside shakaDemo.Main.drmConfiguration_, so it makes sense that this would be the correct fix.
Annoying. It's not obvious at all that that is part of that function. I should have made that a separate function, for clarity. Ah well.

avelad pushed a commit to avelad/shaka-player that referenced this pull request Jun 8, 2022
@github-actions github-actions bot added the status: archived Archived and locked; will not be updated label Jul 25, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 25, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
component: captions/subtitles The issue involves captions or subtitles component: demo page The issue is in the demo page; does not affect production applications status: archived Archived and locked; will not be updated type: bug Something isn't working correctly
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Disabling Shaka controls in the demo still uses Shaka controls for text on the first playback
2 participants