asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Deal with Google's HTML5 autoplay policy

Browse source 
Resume audio context after mouse, touch or key input.
This commit is contained in:
Leon Krause 2019-01-20 14:25:15 +01:00
parent 09e4d7e9eb
commit 8f1669e771
3 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
platform/javascript/audio_driver_javascript.cpp
View file

@ -146,6 +146,15 @@ void AudioDriverJavaScript::start() {
/* clang-format on */
}
void AudioDriverJavaScript::resume() {
/* clang-format off */
EM_ASM({
if (_audioDriver_audioContext.resume)
_audioDriver_audioContext.resume();
});
/* clang-format on */
}
int AudioDriverJavaScript::get_mix_rate() const {
/* clang-format off */

1
platform/javascript/audio_driver_javascript.h
View file

@ -49,6 +49,7 @@ public:
virtual Error init();
virtual void start();
void resume();
virtual int get_mix_rate() const;
virtual SpeakerMode get_speaker_mode() const;
virtual void lock();

6
platform/javascript/os_javascript.cpp
View file

@ -245,6 +245,8 @@ EM_BOOL OS_JavaScript::keydown_callback(int p_event_type, const EmscriptenKeyboa
return false;
}
os->input->parse_input_event(ev);
// Resume audio context after input in case autoplay was denied.
os->audio_driver_javascript.resume();
return true;
}
@ -335,6 +337,8 @@ EM_BOOL OS_JavaScript::mouse_button_callback(int p_event_type, const EmscriptenM
ev->set_button_mask(mask);
os->input->parse_input_event(ev);
// Resume audio context after input in case autoplay was denied.
os->audio_driver_javascript.resume();
// Prevent multi-click text selection and wheel-click scrolling anchor.
// Context menu is prevented through contextmenu event.
return true;
@ -663,6 +667,8 @@ EM_BOOL OS_JavaScript::touch_press_callback(int p_event_type, const EmscriptenTo
os->input->parse_input_event(ev);
}
// Resume audio context after input in case autoplay was denied.
os->audio_driver_javascript.resume();
return true;
}