fix several bugs in new music engine

Author: bladecoder

blade-engine/src/com/bladecoder/engine/actions/MusicAction.java

@@ -27,21 +27,25 @@ public class MusicAction implements Action {
 	@ActionPropertyDescription("The music filename to play. If empty, the current music will be stopped.")
 	private String filename;
 
-	@ActionProperty(required = true)
+	@ActionProperty(required = true, defaultValue = "false")
 	@ActionPropertyDescription("Music Loop")
 	private boolean loop = false;
 
-	@ActionProperty(required = true)
+	@ActionProperty(required = true, defaultValue = "0")
 	@ActionPropertyDescription("The music starts to play after the delay.")
 	private float initialDelay = 0;
 
-	@ActionProperty(required = true)
+	@ActionProperty(required = true, defaultValue = "-1")
 	@ActionPropertyDescription("Time for repeating the music when no looping. -1 for no repeat.")
 	private float repeatDelay = -1;
 
-	@ActionProperty(required = true)
+	@ActionProperty(required = true, defaultValue = "true")
 	@ActionPropertyDescription("Stops the music when leaving the current scene.")
 	private boolean stopWhenLeaving = true;
+	
+	@ActionProperty(required = true, defaultValue = "1.0")
+	@ActionPropertyDescription("Volume of the music [0-1].")
+	private float volume = 1.0f;
 
 	@Override
 	public boolean run(VerbRunner cb) {
@@ -57,6 +61,7 @@ public boolean run(VerbRunner cb) {
 			md.setInitialDelay(initialDelay);
 			md.setRepeatDelay(repeatDelay);
 			md.setStopWhenLeaving(stopWhenLeaving);
+			md.setVolume(volume);
 
 			musicEngine.setMusic(md);
 		}

blade-engine/src/com/bladecoder/engine/model/InteractiveActor.java

@@ -280,6 +280,13 @@ public void read(Json json, JsonValue jsonData) {
 			layer = json.readValue("layer", String.class, jsonData);
 		} else {
 			playingSound = json.readValue("playingSound", String.class, jsonData);
+			
+			if(playingSound != null && (sounds == null || sounds.get(playingSound) == null)) {
+				EngineLogger.debug("Playing sound not found: " + playingSound);
+				playingSound = null;
+			}
+			
+			
 			playerInside = json.readValue("playerInside", boolean.class, false, jsonData);
 			String newLayer = json.readValue("layer", String.class, jsonData);
 

blade-engine/src/com/bladecoder/engine/model/MusicDesc.java

@@ -27,6 +27,8 @@ public class MusicDesc {
 	 */
 	private boolean stopWhenLeaving = true;
 
+	private float volume = 1.0f;
+	
 	public MusicDesc() {
 
 	}
@@ -37,6 +39,7 @@ public MusicDesc(MusicDesc md) {
 		initialDelay = md.getInitialDelay();
 		repeatDelay = md.getRepeatDelay();
 		stopWhenLeaving = md.isStopWhenLeaving();
+		volume = md.getVolume();
 	}
 
 	public String getFilename() {
@@ -78,4 +81,12 @@ public boolean isStopWhenLeaving() {
 	public void setStopWhenLeaving(boolean stopWhenLeaving) {
 		this.stopWhenLeaving = stopWhenLeaving;
 	}
+
+	public float getVolume() {
+		return volume;
+	}
+
+	public void setVolume(float volume) {
+		this.volume = volume;
+	}
 }

blade-engine/src/com/bladecoder/engine/model/MusicEngine.java

@@ -55,36 +55,35 @@ public void stopMusic() {
 	public void setMusic(MusicDesc d) {
 		stopMusic();
 		currentMusicDelay = 0;
-		
+
 		if (d != null) {
-			if(!d.getFilename().equals(desc.getFilename())) {
+			if (desc != null)
 				dispose();
-				
-				desc = new MusicDesc(d);
-								
-				loadAssets();
-				EngineAssetManager.getInstance().finishLoading();
-				music = EngineAssetManager.getInstance().getMusic(desc.getFilename());
-			} else {
-				// Don't dispose if is the same music file.
-				desc = new MusicDesc(d);
-			}
+
+			desc = new MusicDesc(d);
+
+			retrieveAssets();
 		} else {
 			dispose();
 			desc = null;
 		}
 	}
-	
+
 	public void leaveScene(MusicDesc newMusicDesc) {
-		if(newMusicDesc != null) {
+
+		if (desc != null && !desc.isStopWhenLeaving() && 
+				(newMusicDesc == null || newMusicDesc.getFilename().equals(desc.getFilename())))
+			return;
+
+		if (desc != null) {
 			currentMusicDelay = 0;
 			stopMusic();
 			dispose();
+		}
+
+		if (newMusicDesc != null) {
 			desc = new MusicDesc(newMusicDesc);
-		} else if(music != null && desc.isStopWhenLeaving()) {
-			currentMusicDelay = 0;
-			stopMusic();
-			dispose();
+		} else {
 			desc = null;
 		}
 	}
@@ -113,7 +112,7 @@ public void update(float delta) {
 
 	@Override
 	public void dispose() {
-		if ( music != null) {
+		if (music != null) {
 			EngineLogger.debug("DISPOSING MUSIC: " + desc.getFilename());
 			EngineAssetManager.getInstance().disposeMusic(desc.getFilename());
 			music = null;
@@ -132,8 +131,17 @@ public void loadAssets() {
 	@Override
 	public void retrieveAssets() {
 		if (music == null && desc != null) {
+			
+			if(!EngineAssetManager.getInstance().isLoaded(desc.getFilename())) {
+				loadAssets();
+				EngineAssetManager.getInstance().finishLoading();
+			}
+			
 			EngineLogger.debug("RETRIEVING MUSIC: " + desc.getFilename());
+			
 			music = EngineAssetManager.getInstance().getMusic(desc.getFilename());
+			music.setVolume(desc.getVolume());
+
 			if (isPlayingSer) {
 				if (music != null) {
 					music.setPosition(musicPosSer);

blade-engine/src/com/bladecoder/engine/model/World.java

@@ -977,6 +977,9 @@ public void read(Json json, JsonValue jsonData) {
 
 			transition = json.readValue("transition", Transition.class, jsonData);
 			musicEngine = json.readValue("musicEngine", MusicEngine.class, jsonData);
+			
+			if(musicEngine == null)
+				musicEngine = new MusicEngine();
 
 			ActionCallbackQueue.read(json, jsonData);