aboutsummaryrefslogtreecommitdiff
path: root/src/library_sdl.js
diff options
context:
space:
mode:
authorILOVEPIE <thehairyrock@gmail.com>2013-03-31 09:20:48 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-09-24 16:56:44 -0700
commitdcbdbb420fe38fa173710d3de8adce9e684bf9b0 (patch)
tree96b3d6765c6ca7eca7bf1e0032e8a555742b97ca /src/library_sdl.js
parent0462f14bd6b6bdd9ad6adee0e30bddebab6da144 (diff)
Fixed some stuff I forgot to change.
Signed-off-by: ILOVEPIE <thehairyrock@gmail.com>
Diffstat (limited to 'src/library_sdl.js')
-rw-r--r--src/library_sdl.js27
1 files changed, 15 insertions, 12 deletions
diff --git a/src/library_sdl.js b/src/library_sdl.js
index a2d0457b..0e5a5df4 100644
--- a/src/library_sdl.js
+++ b/src/library_sdl.js
@@ -1465,6 +1465,10 @@ var LibrarySDL = {
samples: {{{ makeGetValue('desired', 'SDL.structs.AudioSpec.samples', 'i16', 0, 1) }}},
callback: {{{ makeGetValue('desired', 'SDL.structs.AudioSpec.callback', 'void*', 0, 1) }}},
userdata: {{{ makeGetValue('desired', 'SDL.structs.AudioSpec.userdata', 'void*', 0, 1) }}},
+ soundSource: new Array(),
+ nextSoundSource: 0,
+ lastSoundSource: -1,
+ nextPlayTime: 0,
paused: true,
timer: null
};
@@ -1503,10 +1507,11 @@ var LibrarySDL = {
}else{
if (typeof(AudioContext) === "function") {
SDL.audio.context = new AudioContext();
- SDL.audio.soundSource = SDL.audio.context.createBufferSource();
} else if (typeof(webkitAudioContext) === "function") {
SDL.audio.context = new webkitAudioContext();
- }
+ } else {
+ throw "no sound!";
+ }
SDL.audio.nextSoundSource = 0;
SDL.audio.soundSource = new Array();
SDL.audio.nextPlayTime = 0;
@@ -1531,11 +1536,8 @@ var LibrarySDL = {
}
SDL.audio.nextPlayTime = SDL.audio.context.currentTime+SDL.audio.soundSource[SDL.audio.nextSoundSource].buffer.duration;
- if(typeof(SDL.audio.soundSource.start)=== "function"){
- SDL.audio.soundSource[SDL.audio.nextSoundSource].start(SDL.audio.nextPlayTime);
- }else{
- SDL.audio.soundSource[SDL.audio.nextSoundSource].noteOn(SDL.audio.nextPlayTime);
- }
+
+ SDL.audio.soundSource[SDL.audio.nextSoundSource].start(SDL.audio.nextPlayTime);
SDL.audio.lastSoundSource = SDL.Audio.nextSoundSource;
SDL.Audio.nextSoundSource++;
@@ -1559,12 +1561,13 @@ var LibrarySDL = {
SDL_CloseAudio: function() {
if (SDL.audio) {
try{
- if(typeof(SDL.audio.soundSource.stop)=== "function"){
- SDL.audio.soundSource.stop(0);
- }else{
- SDL.audio.soundSource.noteOff(0);
- }
+ for(var i = 0; i<SDL.audio.soundSource.length;i++){
+ if(!(typeof(SDL.audio.soundSource[i]==="undefined"))){
+ SDL.audio.soundSource[i].stop(0);
+ }
+ }
}catch(e){}
+ SDL.audo.soundSource = null;
_SDL_PauseAudio(1);
_free(SDL.audio.buffer);
SDL.audio = null;