Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace tab with 4 spaces

This commit is contained in:
minggo 2014-12-10 18:32:58 +08:00
parent 77ed7a47e2
commit 0e7470505f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxMusic.java
View File

@ -137,10 +137,10 @@ public class Cocos2dxMusic {
mBackgroundMediaPlayer.release(); mBackgroundMediaPlayer.release();
mBackgroundMediaPlayer = createMediaplayer(mCurrentPath); mBackgroundMediaPlayer = createMediaplayer(mCurrentPath);
/** /**
* should set the state, if not, the following sequence will be error * should set the state, if not, the following sequence will be error
* play -> pause -> stop -> resume * play -> pause -> stop -> resume
*/ */
this.mPaused = false; this.mPaused = false;
} }
} }
@ -197,11 +197,11 @@ public class Cocos2dxMusic {
public void setBackgroundVolume(float volume) { public void setBackgroundVolume(float volume) {
if (volume < 0.0f) { if (volume < 0.0f) {
volume = 0.0f; volume = 0.0f;
} }
if (volume > 1.0f) { if (volume > 1.0f) {
volume = 1.0f; volume = 1.0f;
} }
this.mLeftVolume = this.mRightVolume = volume; this.mLeftVolume = this.mRightVolume = volume;

4
cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxSound.java
View File

@ -250,10 +250,10 @@ public class Cocos2dxSound {
public void setEffectsVolume(float volume) { public void setEffectsVolume(float volume) {
// volume should be in [0, 1.0] // volume should be in [0, 1.0]
if (volume < 0) { if (volume < 0) {
volume = 0; volume = 0;
} }
if (volume > 1) { if (volume > 1) {
volume = 1; volume = 1;
} }
this.mLeftVolume = this.mRightVolume = volume; this.mLeftVolume = this.mRightVolume = volume;