SDL_mixer, fix onended callback to set correct audio status

Author: caiiiycuk

src/library_sdl.js

@@ -2861,7 +2861,7 @@ var LibrarySDL = {
       audio.frequency = info.audio.frequency;
     }
     audio['onended'] = function() { // TODO: cache these
-      if (channelInfo.audio == this) { channelInfo.audio.paused = true; channelInfo.audio = null; }
+      if (channelInfo.audio === this || channelInfo.audio.webAudioNode === this) { channelInfo.audio.paused = true; channelInfo.audio = null; }
       if (SDL.channelFinished)  {{{ makeDynCall('vi', 'SDL.channelFinished') }}}(channel);
     }
     if (channelInfo.audio) {
@@ -2946,7 +2946,7 @@ var LibrarySDL = {
     } else if (info.audio) { // Play via the <audio> element
       audio = info.audio;
     }
-    audio['onended'] = function() { if (SDL.music.audio == this) _Mix_HaltMusic(); } // will send callback
+    audio['onended'] = function() { if (SDL.music.audio === this || SDL.music.audio.webAudioNode === this) _Mix_HaltMusic(); } // will send callback
     audio.loop = loops != 0 && loops != 1; // TODO: handle N loops for finite N
     audio.volume = SDL.music.volume;
     SDL.music.audio = audio;

test/browser/test_sdl_audio_mix_playing.cpp

@@ -0,0 +1,45 @@
+#include <SDL/SDL_mixer.h>
+#include <chrono>
+#include <emscripten.h>
+
+using namespace std::chrono;
+
+Mix_Chunk* chunk = nullptr;
+uint64_t started = 0;
+
+void loop() {
+    uint64_t now = duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count();
+    if (now - started > 2000) {
+      // length of sound is 1sec
+      printf("isPlaying? %s\n", Mix_Playing(0) ? "yes" : "no");
+      emscripten_force_exit(Mix_Playing(0) ? -1 : 0);
+    }
+}
+
+int main(int argc, char** argv) {
+    if ((Mix_Init(MIX_INIT_OGG) & MIX_INIT_OGG) != MIX_INIT_OGG) {
+      printf("ERR! Mix_Init: Failed to init with required flags support!\n");
+      printf("ERR! Mix_Init: %s\n", Mix_GetError());
+      return -1;
+    }
+
+    if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, 1, 1024) == -1) {
+      printf("ERR! Mix_OpenAudio: %s\n", Mix_GetError());
+      return -1;
+    }
+
+    Mix_AllocateChannels(1);
+    chunk = Mix_LoadWAV("/sound.ogg");
+    if (!chunk) {
+      printf("ERR! Mix_LoadWAV: %s\n", Mix_GetError());
+      return -1;
+    }
+    Mix_PlayChannel(0, chunk, 0);
+    if (!Mix_Playing(0)) {
+      printf("ERR! Channel is not playing\n");
+      return -1;
+    }
+    started = duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count();
+    emscripten_set_main_loop(loop, 0, 0);
+    return 0;
+}

test/test_interactive.py

@@ -91,6 +91,15 @@ def test_sdl_audio_mix_channels_halt(self, args):
 
     self.btest_exit('test_sdl_audio_mix_channels_halt.cpp', args=['-O2', '--minify=0', '--preload-file', 'the_entertainer.ogg'] + args)
 
+  @parameterized({
+    '': ([],),
+    'wasmfs': (['-sWASMFS'],),
+  })
+  def test_sdl_audio_mix_playing(self, args):
+    shutil.copyfile(test_file('sounds/noise.ogg'), self.in_dir('sound.ogg'))
+
+    self.btest_exit('test_sdl_audio_mix_playing.cpp', args=['-O2', '--minify=0', '--preload-file', 'sound.ogg'] + args)
+
   @parameterized({
     '': ([],),
     'wasmfs': (['-sWASMFS'],),