diff options
author | Alon Zakai <alonzakai@gmail.com> | 2012-03-27 13:24:49 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2012-03-27 13:24:49 -0700 |
commit | 7450114c4d6c3cac7c262f72f04bb7b1ac72e674 (patch) | |
tree | 22eff2ff392dfd551a20251d1b85aa6ff9307314 /src/library_sdl.js | |
parent | e39cb11407e0d646dca3cbea244ce4189680aa4a (diff) |
support wav and mp3 audio suffixes too
Diffstat (limited to 'src/library_sdl.js')
-rw-r--r-- | src/library_sdl.js | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/library_sdl.js b/src/library_sdl.js index db3771e9..2f3261fc 100644 --- a/src/library_sdl.js +++ b/src/library_sdl.js @@ -737,6 +737,7 @@ mergeInto(LibraryManager.library, { assert(raw, 'Cannot find preloaded audio ' + filename); var id = SDL.audios.length; SDL.audios.push({ + source: filename, audio: raw }); return id; @@ -748,26 +749,15 @@ mergeInto(LibraryManager.library, { }, Mix_PlayChannel: function(channel, id, loops) { + // TODO: handle loops var audio = SDL.audios[id].audio; audio.play(); - return 0; // XXX should return channel + return 1; // XXX should return channel }, Mix_PlayChannelTimed: 'Mix_PlayChannel', // XXX ignore Timing - Mix_LoadMUS: function(filename) { - filename = FS.standardizePath(Pointer_stringify(filename)); - var id = SDL.audios.length; - SDL.audios.push({ - audio: new Audio(filename) - }); - return id; - }, - - Mix_FreeMusic: function(id) { - SDL.audios[id].audio.pause(); - SDL.audios[id] = null; - return 0; - }, + Mix_LoadMUS: 'Mix_LoadWAV_RW', + Mix_FreeMusic: 'Mix_FreeChunk', Mix_PlayMusic: function(id, loops) { if (loops == 0) return; |