fixed cocos2d#885: make SimpleAudioEngine::setEffectVolume() take eff…

…ect immediately on android
angeltown · Dec 1, 2011 · 5c33014 · 5c33014
1 parent 9537cf8
commit 5c33014
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 0 deletions.
diff --git a/HelloLua/android/src/org/cocos2dx/lib/Cocos2dxSound.java b/HelloLua/android/src/org/cocos2dx/lib/Cocos2dxSound.java
@@ -187,8 +187,24 @@ public float getEffectsVolume(){
 		return (this.mLeftVolume + this.mRightVolume) / 2;
 	}
 
+	@SuppressWarnings("unchecked")
 	public void setEffectsVolume(float volume){
+		// volume should be in [0, 1.0]
+		if (volume < 0){
+			volume = 0;
+		}	
+		if (volume > 1){
+			volume = 1;
+		}
+
 		this.mLeftVolume = this.mRightVolume = volume;
+
+		// change the volume of playing sounds
+		Iterator<?> iter = this.mSoundIdStreamIdMap.entrySet().iterator();
+		while (iter.hasNext()){
+			Map.Entry<Integer, Integer> entry = (Map.Entry<Integer, Integer>)iter.next();
+			this.mSoundPool.setVolume(entry.getValue(), mLeftVolume, mRightVolume);
+		}
 	}
 
 	public void end(){		

diff --git a/HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxSound.java b/HelloWorld/android/src/org/cocos2dx/lib/Cocos2dxSound.java
@@ -187,8 +187,24 @@ public float getEffectsVolume(){
 		return (this.mLeftVolume + this.mRightVolume) / 2;
 	}
 
+	@SuppressWarnings("unchecked")
 	public void setEffectsVolume(float volume){
+		// volume should be in [0, 1.0]
+		if (volume < 0){
+			volume = 0;
+		}	
+		if (volume > 1){
+			volume = 1;
+		}
+
 		this.mLeftVolume = this.mRightVolume = volume;
+
+		// change the volume of playing sounds
+		Iterator<?> iter = this.mSoundIdStreamIdMap.entrySet().iterator();
+		while (iter.hasNext()){
+			Map.Entry<Integer, Integer> entry = (Map.Entry<Integer, Integer>)iter.next();
+			this.mSoundPool.setVolume(entry.getValue(), mLeftVolume, mRightVolume);
+		}
 	}
 
 	public void end(){		

diff --git a/tests/test.android/src/org/cocos2dx/lib/Cocos2dxSound.java b/tests/test.android/src/org/cocos2dx/lib/Cocos2dxSound.java
@@ -187,8 +187,24 @@ public float getEffectsVolume(){
 		return (this.mLeftVolume + this.mRightVolume) / 2;
 	}
 
+	@SuppressWarnings("unchecked")
 	public void setEffectsVolume(float volume){
+		// volume should be in [0, 1.0]
+		if (volume < 0){
+			volume = 0;
+		}	
+		if (volume > 1){
+			volume = 1;
+		}
+
 		this.mLeftVolume = this.mRightVolume = volume;
+
+		// change the volume of playing sounds
+		Iterator<?> iter = this.mSoundIdStreamIdMap.entrySet().iterator();
+		while (iter.hasNext()){
+			Map.Entry<Integer, Integer> entry = (Map.Entry<Integer, Integer>)iter.next();
+			this.mSoundPool.setVolume(entry.getValue(), mLeftVolume, mRightVolume);
+		}
 	}
 
 	public void end(){