PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2025-02-12 16:14:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

emscripten: Destroy and recreate audio voice when in loading routines

Browse source 
This prevents awful audio stuttering in Blink based browsers.
This commit is contained in:
Sebastian Krzyszkowiak 2020-05-10 03:01:33 +02:00
parent e4925f2ecb
commit 6c56bb36b9
No known key found for this signature in database
GPG key ID: E8F235CF3BDBC3FF
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/internal.c
View file

@ -213,6 +213,14 @@ SYMBOL_INTERNAL int SetupAudio(struct Game* game) {
return 0; return 0;
} }
SYMBOL_INTERNAL void StopAudio(struct Game* game) {
if (game->audio.v) {
al_detach_voice(game->audio.v);
}
al_set_default_voice(NULL);
game->audio.v = NULL;
}
SYMBOL_INTERNAL void DrawConsole(struct Game* game) { SYMBOL_INTERNAL void DrawConsole(struct Game* game) {
double game_time = al_get_time(); double game_time = al_get_time();
if (game->show_console) { if (game->show_console) {

1
src/internal.h
View file

@ -107,6 +107,7 @@ void FreezeGamestates(struct Game* game);
void UnfreezeGamestates(struct Game* game); void UnfreezeGamestates(struct Game* game);
void ResizeGamestates(struct Game* game); void ResizeGamestates(struct Game* game);
int SetupAudio(struct Game* game); int SetupAudio(struct Game* game);
void StopAudio(struct Game* game);
void DrawConsole(struct Game* game); void DrawConsole(struct Game* game);
void Console_Load(struct Game* game); void Console_Load(struct Game* game);
void Console_Unload(struct Game* game); void Console_Unload(struct Game* game);

8
src/mainloop.c
View file

@ -311,7 +311,7 @@ static inline bool MainloopTick(struct Game* game) {
while (tmp) { while (tmp) {
if (tmp->pending_unload) { if (tmp->pending_unload) {
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
al_detach_voice(game->audio.v); StopAudio(game);
#endif #endif
PrintConsole(game, "Unloading gamestate \"%s\"...", tmp->name); PrintConsole(game, "Unloading gamestate \"%s\"...", tmp->name);
tmp->loaded = false; tmp->loaded = false;
@ -320,12 +320,12 @@ static inline bool MainloopTick(struct Game* game) {
(*tmp->api->unload)(game, tmp->data); (*tmp->api->unload)(game, tmp->data);
PrintConsole(game, "Gamestate \"%s\" unloaded successfully.", tmp->name); PrintConsole(game, "Gamestate \"%s\" unloaded successfully.", tmp->name);
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
al_attach_mixer_to_voice(game->audio.mixer, game->audio.v); SetupAudio(game);
#endif #endif
} }
if (tmp->pending_load) { if (tmp->pending_load) {
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
al_detach_voice(game->audio.v); StopAudio(game);
#endif #endif
if (tmp->show_loading && game->_priv.loading.gamestate->open) { if (tmp->show_loading && game->_priv.loading.gamestate->open) {
(*game->_priv.loading.gamestate->api->start)(game, game->_priv.loading.gamestate->data); (*game->_priv.loading.gamestate->api->start)(game, game->_priv.loading.gamestate->data);
@ -434,7 +434,7 @@ static inline bool MainloopTick(struct Game* game) {
game->loading.shown = false; game->loading.shown = false;
game->_priv.timestamp = al_get_time(); game->_priv.timestamp = al_get_time();
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
al_attach_mixer_to_voice(game->audio.mixer, game->audio.v); SetupAudio(game);
#endif #endif
} }