From 524ba0f9a8e68bcce1cad0015fa1f144c15c5d2e Mon Sep 17 00:00:00 2001
From: Clement Gournay <clemgournay@hotmail.fr>
Date: Sat, 18 Jul 2015 14:07:34 +0900
Subject: [PATCH] Sound gestion improved

---
 src/js/controller.js  | 6 +++---
 src/js/game.js        | 4 ++--
 src/js/soundsystem.js | 5 -----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/js/controller.js b/src/js/controller.js
index 86516ce..6d81c6f 100644
--- a/src/js/controller.js
+++ b/src/js/controller.js
@@ -39,7 +39,7 @@ function Controller(selectedSong, songData){
                 _game.updateTime();
 				_view.refresh();
             }
-            else if(ms>=0 && !started){ //when music starts
+            else if(ms>=0 && !started){ //when music shall starts
                 assets.sounds["main-music"].play();
                 started=true;
             }
@@ -93,9 +93,9 @@ function Controller(selectedSong, songData){
     }
     
     this.restartSong = function(){
-		_game.pauseSound("main-music", true);
+		assets.sounds["main-music"].pause();
+		assets.sounds["main-music"].currentTime=0;
 		clearInterval(_mainLoop);
-		//songData.circles.forEach(function(circle){
 		$("#screen").load("/src/views/game.html", function(){
 			var taikoGame = new Controller(selectedSong, songData);
 			taikoGame.run();
diff --git a/src/js/game.js b/src/js/game.js
index a598143..98f5c27 100644
--- a/src/js/game.js
+++ b/src/js/game.js
@@ -222,11 +222,11 @@ function Game(controller, selectedSong, songData){
     
     this.toggleMainMusic = function(){
         if(_mainMusicPlaying){
-            _soundSystem.pauseSound("main-music", false);
+            assets.sounds["main-music"].pause();
             _mainMusicPlaying=false;
         }
         else{
-            _soundSystem.playSound("main-music");
+            assets.sounds["main-music"].play();
             _mainMusicPlaying=true;
         }
     }
diff --git a/src/js/soundsystem.js b/src/js/soundsystem.js
index 03e2a39..295de8d 100644
--- a/src/js/soundsystem.js
+++ b/src/js/soundsystem.js
@@ -29,11 +29,6 @@ function soundSystem(controller){
 		}
 		
 	}
-	
-	this.pauseSound = function(soundID, stop){
-		_sounds[soundID].pause();
-		if(stop) _sounds[soundID].currentTime=0;
-	}
 
     this.fadeOutMusic = function(){