Merge pull request #1386 from michaeljbishop/sdl_rwops

Add support for `SDL_RWFromConstMem()` for .ogg files.

2 files changed, 30 insertions, 3 deletions

diff --git a/tests/runner.py b/tests/runner.py
index e16fc12e..4a9bf623 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -12998,11 +12998,13 @@ Press any key to continue.'''
     def test_sdl_audio(self):
       shutil.copyfile(path_from_root('tests', 'sounds', 'alarmvictory_1.ogg'), os.path.join(self.get_dir(), 'sound.ogg'))
       shutil.copyfile(path_from_root('tests', 'sounds', 'alarmcreatemiltaryfoot_1.wav'), os.path.join(self.get_dir(), 'sound2.wav'))
+      shutil.copyfile(path_from_root('tests', 'sounds', 'noise.ogg'), os.path.join(self.get_dir(), 'noise.ogg'))
+      shutil.copyfile(path_from_root('tests', 'sounds', 'the_entertainer.ogg'), os.path.join(self.get_dir(), 'the_entertainer.ogg'))
       open(os.path.join(self.get_dir(), 'bad.ogg'), 'w').write('I claim to be audio, but am lying')
       open(os.path.join(self.get_dir(), 'sdl_audio.c'), 'w').write(self.with_report_result(open(path_from_root('tests', 'sdl_audio.c')).read()))
 
       # use closure to check for a possible bug with closure minifying away newer Audio() attributes
-      Popen([PYTHON, EMCC, '-O2', '--closure', '1', '--minify', '0', os.path.join(self.get_dir(), 'sdl_audio.c'), '--preload-file', 'sound.ogg', '--preload-file', 'sound2.wav', '--preload-file', 'bad.ogg', '-o', 'page.html', '-s', 'EXPORTED_FUNCTIONS=["_main", "_play", "_play2"]']).communicate()
+      Popen([PYTHON, EMCC, '-O2', '--closure', '1', '--minify', '0', os.path.join(self.get_dir(), 'sdl_audio.c'), '--preload-file', 'sound.ogg', '--preload-file', 'sound2.wav', '--embed-file', 'the_entertainer.ogg', '--preload-file', 'noise.ogg', '--preload-file', 'bad.ogg', '-o', 'page.html', '-s', 'EXPORTED_FUNCTIONS=["_main", "_play", "_play2"]']).communicate()
       self.run_browser('page.html', '', '/report_result?1')
 
     def test_sdl_audio_mix_channels(self):
diff --git a/tests/sdl_audio.c b/tests/sdl_audio.c
index ae1b89e9..7373d220 100644
--- a/tests/sdl_audio.c
+++ b/tests/sdl_audio.c
@@ -1,11 +1,13 @@
 #include <stdio.h>
+#include <stdlib.h>
 #include <SDL/SDL.h>
 #include <SDL/SDL_mixer.h>
 #include <assert.h>
 #include <emscripten.h>
+#include <sys/stat.h>
 
-Mix_Chunk *sound, *sound2;
-
+Mix_Chunk *sound, *sound2, *sound3;
+Mix_Music * music;
 int play2();
 
 int play() {
@@ -28,6 +30,9 @@ int play2() {
 
   int channel2 = Mix_PlayChannel(-1, sound2, 0);
   assert(channel2 == 1);
+  int channel3 = Mix_PlayChannel(-1, sound3, 0);
+  assert(channel3 == 2);
+  assert(Mix_PlayMusic(music, 1) == 0);
   return channel2;
 }
 
@@ -39,6 +44,26 @@ int main(int argc, char **argv) {
 
   sound = Mix_LoadWAV("sound.ogg");
   assert(sound);
+  
+  {
+      struct stat info;
+      int result = stat("noise.ogg", &info);
+      char * bytes = malloc( info.st_size );
+      FILE * f = fopen( "noise.ogg", "rb" );
+      fread( bytes, 1, info.st_size, f  );
+      fclose(f);
+  
+      SDL_RWops * ops = SDL_RWFromConstMem(bytes, info.st_size);
+      sound3 = Mix_LoadWAV_RW(ops, 0);
+      SDL_FreeRW(ops);
+      free(bytes);
+  }
+
+  {
+      music = Mix_LoadMUS("the_entertainer.ogg");
+  }
+  
+  
   sound2 = Mix_LoadWAV("sound2.wav");
   assert(sound);