Commit b868c259 authored by Clement Gournay's avatar Clement Gournay

Sound gestion improved

parent 96677c86
......@@ -40,7 +40,7 @@ function Controller(selectedSong, songData){
_view.refresh();
}
else if(ms>=0 && !started){ //when music starts
_game.playSound("main-music");
assets.sounds["main-music"].play();
started=true;
}
......
......@@ -28,7 +28,9 @@ function Loader(){
audio.src = '/assets/audio/'+name;
audio.load();
audio.onloadeddata = function(){
assets.sounds[id] = audio;
assets.sounds[id] = new Audio();
assets.sounds[id].src = audio.src;
assets.sounds[id].load();
_this.assetLoaded();
};
});
......
......@@ -10,7 +10,7 @@ function loadSong(selectedSong){
this.run = function(){
//assets.sounds["start"]["audio"][0].play();
assets.sounds["start"].play();
$("#assets").append("<img id='music-bg' src='/songs/"+_selectedSong.folder+"/bg.png' />");
var audio = new Audio();
......
......@@ -14,7 +14,7 @@ function soundSystem(controller){
_channels[i]["end"] = -1;
_channels[i]["audio"] = new Audio();
}
this.playSound = function(soundID){
for(var i=0;i<_channelMAX;i++){ //play in different sounds in different channels
......@@ -27,7 +27,7 @@ function soundSystem(controller){
break;
}
}
}
this.pauseSound = function(soundID, stop){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment