LOVE/love-android
1
0
Fork 0
mirror of https://github.com/love2d/love-android.git synced 2026-08-12 00:20:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Apply LOVE 11.x-specific patch to SDL2.

Browse Source
This commit is contained in:
Miku AuahDark
2023-04-18 09:39:33 +08:00
parent eac9c7dc6a
commit 8b77791aeb
2 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
love/src/jni/SDL2/android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
+39 -8
View File
@@ -204,6 +204,8 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
public static NativeState mNextNativeState;
public static NativeState mCurrentNativeState;
public static boolean mExitCalledFromJava; // love2d-mod: allow restarting of the native thread
/** If shared libraries (e.g. SDL or the native application) could not be loaded. */
public static boolean mBrokenLibraries = true;
@@ -306,6 +308,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
mCursors = new Hashtable<Integer, PointerIcon>();
mLastCursorID = 0;
mSDLThread = null;
mExitCalledFromJava = false; // love2d-mod: allow restarting of the native thread
mIsResumedCalled = false;
mHasFocus = true;
mNextNativeState = NativeState.INIT;
@@ -378,6 +381,13 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
return;
}
startNative(); // love2d-mod: allow restarting of the native thread
}
// love2d-mod-start: allow restarting of the native thread
public void startNative() {
boolean hadSDLThread = SDLActivity.mSDLThread != null;
// Set up JNI
SDL.setupJNI();
@@ -427,7 +437,12 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
SDLActivity.onNativeDropFile(filename);
}
}
if (hadSDLThread) {
resumeNativeThread();
}
}
// love2d-mod-end: allow restarting of the native thread
protected void pauseNativeThread() {
mNextNativeState = NativeState.PAUSED;
@@ -595,6 +610,20 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
return;
}
appQuitFinish(); // love2d-mod: allow restarting of the native thread
super.onDestroy();
}
// love2d-mod-start: allow restarting of the native thread
public void resetNative() {
Log.v("SDL", "resetNative()");
SDLActivity.mExitCalledFromJava = true; // love2d-mod: allow restarting of the native thread
appQuitFinish();
}
private void appQuitFinish() {
if (SDLActivity.mSDLThread != null) {
// Send Quit event to "SDLThread" thread
@@ -609,9 +638,8 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
}
SDLActivity.nativeQuit();
super.onDestroy();
}
// love2d-mod-end: allow restarting of the native thread
@Override
public void onBackPressed() {
@@ -1885,12 +1913,15 @@ class SDLMain implements Runnable {
Log.v("SDL", "Finished main function");
if (SDLActivity.mSingleton != null && !SDLActivity.mSingleton.isFinishing()) {
// Let's finish the Activity
SDLActivity.mSDLThread = null;
SDLActivity.mSingleton.finish();
} // else: Activity is already being destroyed
// love2d-mod-start: allow restarting of the native thread
if (!SDLActivity.mExitCalledFromJava) {
if (SDLActivity.mSingleton != null && !SDLActivity.mSingleton.isFinishing()) {
// Let's finish the Activity
SDLActivity.mSDLThread = null;
SDLActivity.mSingleton.finish();
} // else: Activity is already being destroyed
}
// love2d-mod-end: allow restarting of the native thread
}
}
love/src/jni/SDL2/include/SDL_config_android.h
+4 -3
View File
@@ -143,9 +143,10 @@
#endif
/* Enable various audio drivers */
#define SDL_AUDIO_DRIVER_ANDROID 1
#define SDL_AUDIO_DRIVER_OPENSLES 1
#define SDL_AUDIO_DRIVER_AAUDIO 1
/* love2d-mod: Audio is handled by OpenAL */
#define SDL_AUDIO_DRIVER_ANDROID 0
#define SDL_AUDIO_DRIVER_OPENSLES 0
#define SDL_AUDIO_DRIVER_AAUDIO 0
#define SDL_AUDIO_DRIVER_DUMMY 1
/* Enable various input drivers */