BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6561 from kepstin/caption-fixes

Browse Source 
Wait until the media is ready before initializing the acorn player.
This commit is contained in:
Fred Dixon 2019-01-15 14:33:48 -05:00 committed by GitHub
commit fb3bce1d7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
record-and-playback/presentation/playback/presentation/2.0/playback.js
View File

@ -531,16 +531,6 @@ function loadPlayback() {
loadAudio(); loadAudio();
} }
// load up the acorn controls
logger.info("==Loading acorn media player");
$('#video').acornMediaPlayer({
theme: 'bigbluebutton',
volumeSlider: 'vertical'
});
$('#video').on("swap", function() {
swapVideoPresentation();
});
if (hasDeskshare) { if (hasDeskshare) {
loadDeskshare(); loadDeskshare();
} else { } else {
@ -802,6 +792,16 @@ document.addEventListener('playback-ready', function(event) {
if (dataReady && mediaReady && contentReady) { if (dataReady && mediaReady && contentReady) {
runPopcorn(); runPopcorn();
if (firstLoad) { if (firstLoad) {
// load up the acorn controls
logger.info("==Loading acorn media player");
$('#video').acornMediaPlayer({
theme: 'bigbluebutton',
volumeSlider: 'vertical'
});
$('#video').on("swap", function() {
swapVideoPresentation();
});
initPopcorn(); initPopcorn();
} }
} }