aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael J. Bishop <mbtyke@gmail.com>2013-02-22 17:18:30 -0500
committerMichael J. Bishop <mbtyke@gmail.com>2013-02-22 17:18:30 -0500
commit2e9cb244f45c8dfe6bbd4b1f779c15b0d73a0f74 (patch)
tree5252d08cfbce0a7f5a9cfe07b393e4f4b9d171a6
parenta7d7dad8baefd2fae9f56ab46afe7af7fef215cd (diff)
Changed formatting and fixed a bug in response to Kripken's
recommendations.
-rw-r--r--src/library_sdl.js20
1 files changed, 7 insertions, 13 deletions
diff --git a/src/library_sdl.js b/src/library_sdl.js
index 1cb41071..7e76d41d 100644
--- a/src/library_sdl.js
+++ b/src/library_sdl.js
@@ -1437,46 +1437,41 @@ var LibrarySDL = {
// http://www.libsdl.org/projects/SDL_mixer/docs/SDL_mixer_38.html#SEC38
// "Note: Does not check if the channel has been paused."
Mix_Playing: function(id) {
- if (id === -1)
- {
+ if (id === -1) {
var count = 0;
- for (var i = 0; i<SDL.audios.length;i++)
+ for (var i = 0; i < SDL.audios.length; i++)
count += SDL.Mix_Playing(i);
return count;
}
var info = SDL.audios[id];
- if (info && info.audio && !info.audio.playing)
+ if (info && info.audio && !info.audio.paused)
return 1;
return 0;
},
Mix_Pause: function(id) {
- if (id === -1)
- {
+ if (id === -1) {
for (var i = 0; i<SDL.audios.length;i++)
SDL.Mix_Pause(i);
return;
}
var info = SDL.audios[id];
if (info && info.audio)
- {
- console.log("paused " + id);
info.audio.pause();
- }
},
// http://www.libsdl.org/projects/SDL_mixer/docs/SDL_mixer_39.html#SEC39
Mix_Paused: function(id) {
- if (id === -1)
- {
+ if (id === -1) {
var pausedCount = 0;
for (var i = 0; i<SDL.audios.length;i++)
pausedCount += SDL.Mix_Paused(i);
return pausedCount;
}
var info = SDL.audios[id];
- if (info && info.audio && info.audio.paused)
+ if (info && info.audio && info.audio.paused) {
return 1;
+ }
return 0;
},
@@ -1495,7 +1490,6 @@ var LibrarySDL = {
var info = SDL.audios[id];
if (info && info.audio)
{
- console.log("resumed " + id);
info.audio.play();
}
},