diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index de605ee..815a7fe 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -164,7 +164,7 @@ if (EMSCRIPTEN) -sASYNCIFY=1 -sASYNCIFY_IGNORE_INDIRECT=1 -sASYNCIFY_REMOVE=SDL_Delay - -sASYNCIFY_IMPORTS=muspcm_load_no,muspcm_load_data,muspcm_load_mixlr,muspcm_waitend,wait_vsync,load_mincho_font + -sASYNCIFY_IMPORTS=wait_vsync -sASYNCIFY_ADD=commands2F60,nact_main,send_agsevent,cb_waitkey_sprite -sALLOW_MEMORY_GROWTH=1 -sNO_EXIT_RUNTIME=1 diff --git a/src/font.c b/src/font.c index 2be80a0..8a82c12 100644 --- a/src/font.c +++ b/src/font.c @@ -235,9 +235,7 @@ boolean font_get_antialias(void) { } #ifdef __EMSCRIPTEN__ -EM_JS(int, load_mincho_font, (void), { - return Asyncify.handleSleep(function(wakeUp) { - xsystem35.load_mincho_font().then(wakeUp); - }); +EM_ASYNC_JS(int, load_mincho_font, (void), { + await xsystem35.load_mincho_font(); }); #endif diff --git a/src/pcm.emscripten.c b/src/pcm.emscripten.c index 39e4467..ec10778 100644 --- a/src/pcm.emscripten.c +++ b/src/pcm.emscripten.c @@ -36,16 +36,16 @@ EM_JS(int, muspcm_reset, (void), { return xsystem35.audio.pcm_reset();; }); -EM_JS(int, muspcm_load_no, (int slot, int no), { // async - return Asyncify.handleSleep((wakeUp) => xsystem35.audio.pcm_load(slot, no, wakeUp)); +EM_ASYNC_JS(int, muspcm_load_no, (int slot, int no), { + return await xsystem35.audio.pcm_load(slot, no); }); -EM_JS(int, muspcm_load_data, (int slot, uint8_t *buf, uint32_t len), { // async - return Asyncify.handleSleep((wakeUp) => xsystem35.audio.pcm_load_data(slot, buf, len, wakeUp)); +EM_ASYNC_JS(int, muspcm_load_data, (int slot, uint8_t *buf, uint32_t len), { + return await xsystem35.audio.pcm_load_data(slot, buf, len); }); -EM_JS(int, muspcm_load_mixlr, (int slot, int noL, int noR), { // async - return Asyncify.handleSleep((wakeUp) => xsystem35.audio.pcm_load_mixlr(slot, noL, noR, wakeUp)); +EM_ASYNC_JS(int, muspcm_load_mixlr, (int slot, int noL, int noR), { + return await xsystem35.audio.pcm_load_mixlr(slot, noL, noR); }); EM_JS(int, muspcm_unload, (int slot), { @@ -91,6 +91,6 @@ EM_JS(boolean, muspcm_isplaying, (int slot), { return xsystem35.audio.pcm_isplaying(slot); }); -EM_JS(int, muspcm_waitend, (int slot), { // async - return Asyncify.handleSleep((wakeUp) => xsystem35.audio.pcm_waitend(slot, wakeUp)); +EM_ASYNC_JS(int, muspcm_waitend, (int slot), { + return await xsystem35.audio.pcm_waitend(slot); });