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

Merge pull request #509 from minggo/iss719 

fixed #719: update java code to HelloLua & tests
This commit is contained in:
minggo 2011-09-15 01:24:51 -07:00
parent 4c51914cfc ae403153c7
commit 55ab2aa708
4 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
HelloLua/android/src/org/cocos2dx/lib/Cocos2dxActivity.java
View File

@ -24,8 +24,7 @@ THE SOFTWARE.
package org.cocos2dx.lib;
import org.cocos2dx.hellolua.R;
import org.cocos2dx.application.R;
import android.app.Activity;
import android.app.AlertDialog;
@ -105,6 +104,10 @@ public class Cocos2dxActivity extends Activity{
accelerometer.disable();
}
public static void preloadBackgroundMusic(String path){
backgroundMusicPlayer.preloadBackgroundMusic(path);
}
public static void playBackgroundMusic(String path, boolean isLoop){
backgroundMusicPlayer.playBackgroundMusic(path, isLoop);
}

18
HelloLua/android/src/org/cocos2dx/lib/Cocos2dxMusic.java
View File

@ -48,6 +48,22 @@ public class Cocos2dxMusic {
initData();
}
public void preloadBackgroundMusic(String path){
if ((mCurrentPath == null) || (! mCurrentPath.equals(path))){
// preload new background music
// release old resource and create a new one
if (mBackgroundMediaPlayer != null){
mBackgroundMediaPlayer.release();
}
mBackgroundMediaPlayer = createMediaplayerFromAssets(path);
// record the path
mCurrentPath = path;
}
}
public void playBackgroundMusic(String path, boolean isLoop){
if (mCurrentPath == null){
// it is the first time to play background music
@ -159,8 +175,8 @@ public class Cocos2dxMusic {
}
public void setBackgroundVolume(float volume){
this.mLeftVolume = this.mRightVolume = volume;
if (this.mBackgroundMediaPlayer != null){
this.mLeftVolume = this.mRightVolume = volume;
this.mBackgroundMediaPlayer.setVolume(this.mLeftVolume, this.mRightVolume);
}
}

4
tests/test.android/src/org/cocos2dx/lib/Cocos2dxActivity.java
View File

@ -106,6 +106,10 @@ public class Cocos2dxActivity extends Activity{
accelerometer.disable();
}
public static void preloadBackgroundMusic(String path){
backgroundMusicPlayer.preloadBackgroundMusic(path);
}
public static void playBackgroundMusic(String path, boolean isLoop){
backgroundMusicPlayer.playBackgroundMusic(path, isLoop);
}

16
tests/test.android/src/org/cocos2dx/lib/Cocos2dxMusic.java
View File

@ -48,6 +48,22 @@ public class Cocos2dxMusic {
initData();
}
public void preloadBackgroundMusic(String path){
if ((mCurrentPath == null) || (! mCurrentPath.equals(path))){
// preload new background music
// release old resource and create a new one
if (mBackgroundMediaPlayer != null){
mBackgroundMediaPlayer.release();
}
mBackgroundMediaPlayer = createMediaplayerFromAssets(path);
// record the path
mCurrentPath = path;
}
}
public void playBackgroundMusic(String path, boolean isLoop){
if (mCurrentPath == null){
// it is the first time to play background music