tests for IE and different types of adding sounds

BlackScorpGames · Mar 8, 2012 · 2865321 · 2865321
1 parent 6b99857
commit 2865321
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 33 deletions.
diff --git a/assets/js/audio.js b/assets/js/audio.js
@@ -33,7 +33,7 @@ Crafty.extend({
 
             this.canPlay(); //Setup supported Extensions
 
-            var audio,source,ext,path;
+            var audio,ext,path;
             if(arguments.length === 1 && typeof id === "object"){
                 for(var i in id){
                     for(var src in id[i]){
@@ -56,33 +56,40 @@ Crafty.extend({
                 }          
             }
             if(typeof id === "string"){
-
                 audio = this.audioElement();
                 audio.id = id;
                 audio.preload = "auto";
                 audio.volume = Crafty.audio.volume;
-                ext = url.substr(url.lastIndexOf('.') + 1).toLowerCase();
-                if(typeof url === "string" && this.supported[ext]){
-                    audio.src = url;
-                    if (!Crafty.assets[url]) Crafty.assets[url] = audio;   
+
+                if(typeof url === "string"){
+                    ext = url.substr(url.lastIndexOf('.') + 1).toLowerCase();
+                    if(this.supported[ext]){
+                        audio.src = url;
+                        if (!Crafty.assets[url]) Crafty.assets[url] = audio;  
+                    }
+
                 }
 
                 if(typeof url === "object"){
-                    for(src in url){    
+                    for(src in url){   
+                        audio = this.audioElement();
+                        audio.id = id;
+                        audio.preload = "auto";
+                        audio.volume = Crafty.audio.volume;
                         path = url[src];
                         ext = path.substr(path.lastIndexOf('.') + 1).toLowerCase();	
-                        source = document.createElement('source');
-                        source.src = path;
-                        source.type=this.srcType[ext];
-                        audio.appendChild(source); 
-                        if (!Crafty.assets[path]) Crafty.assets[path] = audio;   
-
+                        if(this.supported[ext]){
+                            audio.src = path;
+                            if (!Crafty.assets[path]) Crafty.assets[path] = audio;   
+                            this.sounds[id] = {
+                                obj:audio,
+                                played:0
+                            } 
+                        }
+
                     }
                 }
-                this.sounds[id] = {
-                    obj:audio,
-                    played:0
-                } 
+
 
             }
 
@@ -103,6 +110,11 @@ Crafty.extend({
                 }
             };    
         },
+        stop:function(id){
+             if(!Crafty.support.audio || !this.sounds[id]) return;
+             var s = this.sounds[id];
+             if(!s.obj.paused) s.obj.pause();
+        },
         mute:function(){
             var s;
             if(!this.muted){

diff --git a/assets/js/levels.js b/assets/js/levels.js
@@ -4,7 +4,7 @@
 //Loading Scene
 Crafty.scene("Loading",function(){
     var toLoad = [];
-    toLoad.push(game_path + "assets/img/loading.jpg", game_path + "assets/img/bg.png");
+    toLoad.push(game_path + "assets/img/loading.jpg", game_path + "assets/img/bg.png",game_path + "media/music/spaceship.ogg");
     for(var i in Crafty.assets){
         toLoad.push(i);
     }
@@ -46,19 +46,24 @@ Crafty.scene("Loading",function(){
             bar.progressbar({
                 value:~~e.percent
             });
-         //   console.log("Loaded: ");
-         // console.log(e.src);
+        //   console.log("Loaded: ");
+        // console.log(e.src);
         },
         function(e) {
             //uh oh, error loading
             console.log("Error on loading: ");
             console.log(e.src);
         }
         );
-
+    //Play background music and repeat will work only Safari /IE
+    Crafty.audio.play("spaceship",-1);
+     Crafty.audio.play("spaceship.ogg",-1); //Works with others
 });
 //Level 1 Scene
 Crafty.scene("Level1",function(){
+    //Stop loading sound
+    Crafty.audio.stop("spaceship");
+    Crafty.audio.stop("spaceship.ogg");
     //Display interface
     $('#interface').show();
     //Setup background of level

diff --git a/assets/js/loader.js b/assets/js/loader.js
@@ -115,6 +115,7 @@ Crafty.extend({
                 } else if (obj.attachEvent)  {  
                     obj.attachEvent('oncanplaythrough', pro);  
                 }
+                obj.onload=pro;
                 obj.load();
             } else if (ext === "jpg" || ext === "jpeg" || ext === "gif" || ext === "png") { 
                 if(!obj) {

diff --git a/assets/js/sounds.js b/assets/js/sounds.js
@@ -1,13 +1,5 @@
 
 Crafty.audio.add({
-    space: [
-    game_path + "media/music/through-space.mp3",
-    game_path + "media/music/through-space.ogg"
-    ],
-    spaceship: [
-    game_path + "media/music/spaceship.mp3",
-    game_path + "media/music/spaceship.ogg"
-    ],
     explosion0: [
     game_path + "media/sounds/explodemini.mp3",
     game_path + "media/sounds/explodemini.ogg"
@@ -33,11 +25,10 @@ Crafty.audio.add({
     game_path + "media/sounds/laser4.ogg"
     ]
 });
-/*
-Crafty.audio.add("space2", game_path + "media/music/through-space.mp3");
 
-Crafty.audio.add("space3",[
+Crafty.audio.add("space",[
     game_path + "media/music/through-space.mp3",
     game_path + "media/music/through-space.ogg"
     ]);
-Crafty.audio.add("space4");*/
+
+Crafty.audio.add("spaceship", game_path + "media/music/spaceship.mp3"); //Will work only Safari/IE