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

Made the loadeffect utility method into a static method. Removed declaration of old method from header file

This commit is contained in:
Krishna 2015-02-26 06:53:20 +01:00
parent 3b54af1763
commit 58df860b4e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/audio/android/jni/cddandroidAndroidJavaEngine.cpp
View File

@ -291,7 +291,7 @@ namespace CocosDenshion {
methodInfo.env->DeleteLocalRef(methodInfo.classID); methodInfo.env->DeleteLocalRef(methodInfo.classID);
} }
void AndroidJavaEngine::loadEffect(const char* pszFilePath, char* loadEffectName) { static void loadEffect(const char* pszFilePath, char* loadEffectName) {
cocos2d::JniMethodInfo methodInfo; cocos2d::JniMethodInfo methodInfo;
std::string fullPath = CocosDenshion::android::getFullPathWithoutAssetsPrefix(pszFilePath); std::string fullPath = CocosDenshion::android::getFullPathWithoutAssetsPrefix(pszFilePath);
@ -307,11 +307,11 @@ namespace CocosDenshion {
void AndroidJavaEngine::preloadEffect(const char* pszFilePath) { void AndroidJavaEngine::preloadEffect(const char* pszFilePath) {
AndroidJavaEngine::loadEffect(pszFilePath, "preloadEffect"); loadEffect(pszFilePath, "preloadEffect");
} }
void AndroidJavaEngine::unloadEffect(const char* pszFilePath) { void AndroidJavaEngine::unloadEffect(const char* pszFilePath) {
AndroidJavaEngine::loadEffect(pszFilePath, "unloadEffect"); loadEffect(pszFilePath, "unloadEffect");
} }
} }
} }

1
cocos/audio/android/jni/cddandroidAndroidJavaEngine.h
View File

@ -53,7 +53,6 @@ namespace CocosDenshion {
void resumeAllEffects(); void resumeAllEffects();
void stopEffect(unsigned int nSoundId); void stopEffect(unsigned int nSoundId);
void stopAllEffects(); void stopAllEffects();
void loadEffect(const char* pszFilePath, char* loadEffectName);
void preloadEffect(const char* pszFilePath); void preloadEffect(const char* pszFilePath);
void unloadEffect(const char* pszFilePath); void unloadEffect(const char* pszFilePath);