Created AudioHandlr.js

Reshuffled Sounds to use it, and deleted sounds.js.

Author: Diogenesthecynic

Sounds/mp3/Bowser Falls.mp3 renamed to Sounds/Sounds/mp3/Bowser Falls.mp3

@@ -127,7 +127,7 @@ function findScore(lev) {
 
 function gainLife(num, nosound) {
   data.lives.amount += typeof(num) == "number" ? num : 1;
-  if(!nosound) play("Gain Life");
+  if(!nosound) AudioPlayer.play("Gain Life");
   updateDataElement(data.lives);
 }
 

Sounds/mp3/Bowser Fires.mp3 renamed to Sounds/Sounds/mp3/Bowser Fires.mp3

@@ -472,7 +472,7 @@ function endCastleInsideRandomFinal(xloc) {
 function placeRandomCastleNPC(xloc) {
   var npc = pushPreThing(Toad, xloc + 194, 12).object;
   npc.text = [
-      pushPreText({innerHTML: "THANK YOU" + window.player.title.toUpperCase() + "!"}, xloc + 160, 66).object,
+      pushPreText({innerHTML: "THANK YOU " + window.player.title.toUpperCase() + "!"}, xloc + 160, 66).object,
       pushPreText({innerHTML: "LOL YOU THOUGHT THERE WOULD BE SOMETHING HERE DIDN'T YOU!"}, xloc + 148, 50).object
     ];
 }

Sounds/mp3/Break Block.mp3 renamed to Sounds/Sounds/mp3/Break Block.mp3

@@ -1,5 +1,5 @@
 /* Load.js */
-// Maps and sounds are loaded via AJAX
+// Maps are loaded via AJAX
 
 /* Maps */
 
@@ -47,46 +47,4 @@ function setNextLevelArr(arr) {
     arr[1] = 1;
   }
   return arr;
-}
-
-
-/* Sounds */
-
-function startLoadingSounds() {
-  var libsounds = library.sounds;
-  setTimeout(function() { loadSounds(libsounds, library.sounds.names, "Sounds/"); }, 7);
-  setTimeout(function() { loadSounds(libsounds, library.sounds.themes, "Sounds/Themes/"); }, 14);
-}
-
-// Loads sounds (in order) from the reference into the container
-function loadSounds(container, reference, prefix) {
-  var sound, name_raw, 
-      details = {
-          preload: 'auto',
-          prefix: '',
-          used: 0
-        },
-      len, i;
-  for(i = 0, len = reference.length; i < len; ++i) {
-    name_raw = reference[i];
-    
-    // Create the sound and store it in the container
-    sound = createElement("Audio", details);
-    container[name_raw] = sound;
-    mlog("Sounds", sound)
-    
-    // Create the MP3 and OGG sources for the audio
-    sound.appendChild(createElement("Source", {
-      type: "audio/mp3",
-      src: prefix + "mp3/" + name_raw + ".mp3"
-    }));
-    sound.appendChild(createElement("Source", {
-      type: "audio/ogg",
-      src: prefix + "ogg/" + name_raw + ".ogg"
-    }));
-    
-    // This preloads the sound.
-    sound.volume = 0;
-    sound.play();
-  }
 }

Sounds/mp3/Bump.mp3 renamed to Sounds/Sounds/mp3/Bump.mp3

@@ -73,7 +73,7 @@ function setAreaSetting(area, setting, sound) {
   if(area.fillStyle.indexOf("Underwater") != -1) goUnderWater();
   else goOntoLand();
 
-  if(sound) playTheme();
+  if(sound) AudioPlayer.playTheme();
   if(gameon) clearAllSprites();
   map.shifting = false;
 }
@@ -217,7 +217,7 @@ function shiftToLocation(loc) {
   // Typically this will do nothing or be from a pipe
   loc.entry(player, loc.entrything);
   // Don't forget the least annoying part of programming this!
-  TimeHandler.addEvent(playTheme, 2);
+  TimeHandler.addEvent(AudioPlayer.playTheme, 2);
 
   // Texts are bound-check checked periodically for peformance reasons
   TimeHandler.addEventInterval(checkTexts, 117, Infinity);
@@ -505,7 +505,7 @@ function walkToPipe() {
   var move = setInterval(function() {
     if(player.piping) {
       // We have started piping
-      if(sounds[0]) sounds[0].pause();
+      AudioPlayer.pauseTheme();
       nokeys = player.keys.run = notime = false;
       clearInterval(move);
       player.maxspeed = player.maxspeedsave;
@@ -551,8 +551,8 @@ function intoPipeHoriz(me, pipe, transport) {
   }, timer);
 }
 function pipePreparations(me) {
-  pauseTheme();
-  play("Pipe");
+  AudioPlayer.pauseTheme();
+  AudioPlayer.play("Pipe");
   locMovePreparations(me);
   me.nofall = me.nocollide = nokeys = notime = true;
   me.movement = me.xvel = me.yvel = 0;
@@ -580,7 +580,7 @@ function startCastle(me) {
 function exitPipeVert(me, pipe) {
   switchContainers(me, characters, scenery);
   me.nofall = nokeys = notime = true;
-  play("Pipe");
+  AudioPlayer.play("Pipe");
   setTop(me, pipe.top);
   setMidXObj(me, pipe, true);
   var dy = unitsize / -4, move = setInterval(function() {
@@ -840,7 +840,7 @@ function endCastleInsideFinal(xloc, last) {
   if(last) {
     pushPreThing(Peach, xloc + 194, 13).object;
     text = stopper.text = [
-      pushPreText({innerHTML: "THANK YOU" + window.player.title.toUpperCase() + "!", style: style}, xloc + 160, 66).object,
+      pushPreText({innerHTML: "THANK YOU " + window.player.title.toUpperCase() + "!", style: style}, xloc + 160, 66).object,
       pushPreText({innerHTML: "YOUR QUEST IS OVER.<BR>WE PRESENT YOU A NEW QUEST.", style: style}, xloc + 148, 50).object,
       pushPreText({innerHTML: "PRESS BUTTON B<BR>TO SELECT A WORLD.", style: style}, xloc + 148, 26).object
     ];
@@ -849,7 +849,7 @@ function endCastleInsideFinal(xloc, last) {
   else {
     pushPreThing(Toad, xloc + 194, 12).object;
     text = stopper.text = [
-      pushPreText({innerHTML: "THANK YOU" + window.player.title.toUpperCase() + "!", style: style}, xloc + 160, 66).object,
+      pushPreText({innerHTML: "THANK YOU " + window.player.title.toUpperCase() + "!", style: style}, xloc + 160, 66).object,
       pushPreText({innerHTML: "BUT OUR PRINCESS IS IN<BR>ANOTHER CASTLE!", style: style}, xloc + 148, 50).object
     ];
   }

Sounds/mp3/Coin.mp3 renamed to Sounds/Sounds/mp3/Coin.mp3

@@ -16,7 +16,6 @@
     <script src="maps.js"></script>
     <script src="mario.js"></script>
     <script src="quadrants.js"></script>
-    <script src="sounds.js"></script>
     <script src="sprites.js"></script>
     <script src="things.js"></script>
     <script src="toned.js"></script>
@@ -26,6 +25,7 @@
 
     <!-- Refactored libraries/frameworks under /src -->
     <script src="src/TimeHandlr/TimeHandlr.js"></script>
+    <script src="src/AudioPlayr/AudioPlayr.js"></script>
 
 </head>
 <body onload="FullScreenMario()">

Sounds/mp3/Ending.mp3 renamed to Sounds/Sounds/mp3/Ending.mp3

@@ -52,9 +52,6 @@ function FullScreenMario() {
   window.gameon = true;
   setMap(1,1);
 
-  // Load sounds after setting the map, since it uses clearAllTimeouts
-  startLoadingSounds();
-  
   log("It took " + (Date.now() - time_start) + " milliseconds to start.");
 }
 
@@ -153,6 +150,65 @@ function resetEvents() {
   });
 }
 
+// Sounds are done with AudioPlayr.js
+function resetSounds() {
+  window.sounds = {};
+  window.theme = false;
+  window.muted = (localStorage && localStorage.muted == "true");
+  
+  window.AudioPlayer = new AudioPlayr({
+    directory: "Sounds",
+    getVolumeLocal: function() { return .49; },
+    getThemeDefault: function() { return area.theme; }, 
+    library: {
+      Sounds: [
+        "Bowser Falls",
+        "Bowser Fires",
+        "Break Block",
+        "Bump",
+        "Coin",
+        "Ending",
+        "Fireball",
+        "Firework",
+        "Flagpole",
+        "Gain Life",
+        "Game Over 2",
+        "Game Over",
+        "Hurry",
+        "Into the Tunnel",
+        "Jump Small",
+        "Jump Super",
+        "Kick",
+        "Level Complete",
+        "Player Dies",
+        "Pause",
+        "Pipe",
+        "Power Down",
+        "Powerup Appears",
+        "Powerup",
+        "Stage Clear",
+        "Vine Emerging",
+        "World Clear",
+        "You Dead"
+      ],
+      Themes: [
+        "Castle",
+        "Overworld",
+        "Underwater",
+        "Underworld",
+        "Star",
+        "Sky",
+        "Hurry Castle",
+        "Hurry Overworld",
+        "Hurry Underwater",
+        "Hurry Underworld",
+        "Hurry Star",
+        "Hurry Sky"
+      ]
+    }
+  });
+}
+
 // Variables regarding the state of the game
 // This is called in setMap to reset everything
 function resetGameState(nocount) {
@@ -170,8 +226,7 @@ function resetGameState(nocount) {
   // Keep a history of pressed keys
   window.gamehistory = [];
   // Clear audio
-  pauseAllSounds();
-  sounds = {};
+  AudioPlayer.pause();
 }
 
 function scrollWindow(x, y) {