mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
merge master
This commit is contained in:
@@ -57,7 +57,7 @@ AndroidJavaEngine::~AndroidJavaEngine()
|
||||
{
|
||||
stopAllEffects();
|
||||
}
|
||||
JniHelper::callStaticVoidMethod(CLASS_NAME, "destoryAudioEngine");
|
||||
JniHelper::callStaticVoidMethod(CLASS_NAME, "destroyAudioEngine");
|
||||
}
|
||||
|
||||
void AndroidJavaEngine::preloadBackgroundMusic(const char* filePath) {
|
||||
|
||||
@@ -259,7 +259,7 @@ public class Cocos2dxHelper {
|
||||
sCocosSound.stopAllEffects();
|
||||
}
|
||||
|
||||
public static void destoryAudioEngine() {
|
||||
public static void destroyAudioEngine() {
|
||||
if (sCocosMusic != null)
|
||||
{
|
||||
sCocosMusic.end();
|
||||
@@ -273,7 +273,7 @@ public class Cocos2dxHelper {
|
||||
}
|
||||
|
||||
public static void reset() {
|
||||
destoryAudioEngine();
|
||||
destroyAudioEngine();
|
||||
onActivityResultListeners.clear();
|
||||
|
||||
if (sAccelerometer != null) {
|
||||
|
||||
Reference in New Issue
Block a user