Add mp3 / ogg file support for smaller audio sprites.

BrainSwap · May 30, 2012 · b9da69e · b9da69e
1 parent 09e5208
commit b9da69e
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 10 deletions.
diff --git a/src/js/core/mandible.helpers.js b/src/js/core/mandible.helpers.js
@@ -222,13 +222,6 @@
         return value ? $('<div/>').html(value).text() : '';
     };
 
-    // Play random type of sound.
-    h.playRandomSound = function(type){
-        var soundAr = ns.data[type + 'Sounds'];
-        var sound = soundAr[Math.floor(Math.random() * soundAr.length)]
-        this.playSound('/sounds/' + type + '_' + sound + '.wav');
-    };
-
     h.playSound = function(file){
         var theme = ns.data.user.get('sounds');
         var $audioPlayer;
@@ -262,8 +255,8 @@
         // Too bad this shorthand doesn't work on Apple Webkit!
         // $audioPlayer.attr('src', '/sounds/' + theme + '/all.wav#t=1.7,4.0');
         $audioPlayer[0].volume = 0.2;
-        if (audioPlayer.seekable){
-                $audioPlayer[0].currentTime = start;
+        if (audioPlayer.readyState > 1){
+            $audioPlayer[0].currentTime = start;
         }else{
             $audioPlayer.bind('loadeddata', function(){
                 $audioPlayer[0].currentTime = start;

diff --git a/src/js/views/app/app.js b/src/js/views/app/app.js
@@ -30,9 +30,14 @@
         },
 
         setTheme: function(){
+            var ext = '.mp3';
             var theme = ns.data.user.get('sounds');
+            // Most browsers support mp3 but Firefox, falling back to .ogg.
+            if ($.browser.mozilla){
+                ext = '.ogg';
+            }
             if (theme !== 'none'){
-                $('#audio-player').attr('src', '/sounds/' + theme + '/all.wav');
+                $('#audio-player').attr('src', '/sounds/' + theme + '/all' + ext);
             }
         },
 

diff --git a/src/sounds/ki/all.mp3 b/src/sounds/ki/all.mp3
diff --git a/src/sounds/ki/all.ogg b/src/sounds/ki/all.ogg
diff --git a/src/sounds/random/all.mp3 b/src/sounds/random/all.mp3
diff --git a/src/sounds/random/all.ogg b/src/sounds/random/all.ogg
diff --git a/src/sounds/random/originals/all.wav b/src/sounds/random/originals/all.wav
diff --git a/src/sounds/random/originals/applause.wav b/src/sounds/random/originals/applause.wav
diff --git a/src/sounds/random/originals/cheering.wav b/src/sounds/random/originals/cheering.wav
diff --git a/src/sounds/random/originals/fanfare.wav b/src/sounds/random/originals/fanfare.wav
diff --git a/src/sounds/random/originals/mmmm.wav b/src/sounds/random/originals/mmmm.wav
diff --git a/src/sounds/random/originals/whahwhah.wav b/src/sounds/random/originals/whahwhah.wav
diff --git a/src/sounds/random/originals/woow.wav b/src/sounds/random/originals/woow.wav