mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-03 10:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Android) Get rid of some forward decls

Browse Source
This commit is contained in:
twinaphex 2015-02-24 20:42:29 +01:00
parent d46f240679
commit e3844f409d
1 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
frontend/drivers/platform_android.c
View File

@ -28,9 +28,7 @@
struct android_app *g_android; struct android_app *g_android;
static pthread_key_t thread_key; static pthread_key_t thread_key;
//forward decls /* Forward declaration. */
static void frontend_android_deinit(void *data);
static void frontend_android_shutdown(bool unused);
extern void android_app_entry(void *args); extern void android_app_entry(void *args);
void engine_handle_cmd(void *data) void engine_handle_cmd(void *data)
@ -748,6 +746,37 @@ static void frontend_android_get_environment_settings(int *argc,
#endif #endif
} }
static void frontend_android_deinit(void *data)
{
JNIEnv *env;
struct android_app *android_app = (struct android_app*)data;
if (!android_app)
return;
RARCH_LOG("Deinitializing RetroArch ...\n");
android_app->activityState = APP_CMD_DEAD;
env = jni_thread_getenv();
if (env && android_app->onRetroArchExit)
CALL_VOID_METHOD(env, android_app->activity->clazz,
android_app->onRetroArchExit);
if (android_app->inputQueue)
{
RARCH_LOG("Detaching Android input queue looper ...\n");
AInputQueue_detachLooper(android_app->inputQueue);
}
}
static void frontend_android_shutdown(bool unused)
{
(void)unused;
// Cleaner approaches don't work sadly.
exit(0);
}
static void frontend_android_init(void *data) static void frontend_android_init(void *data)
{ {
JNIEnv *env; JNIEnv *env;
@ -803,37 +832,6 @@ static void frontend_android_init(void *data)
"getStringExtra", "(Ljava/lang/String;)Ljava/lang/String;"); "getStringExtra", "(Ljava/lang/String;)Ljava/lang/String;");
} }
static void frontend_android_deinit(void *data)
{
JNIEnv *env;
struct android_app *android_app = (struct android_app*)data;
if (!android_app)
return;
RARCH_LOG("Deinitializing RetroArch ...\n");
android_app->activityState = APP_CMD_DEAD;
env = jni_thread_getenv();
if (env && android_app->onRetroArchExit)
CALL_VOID_METHOD(env, android_app->activity->clazz,
android_app->onRetroArchExit);
if (android_app->inputQueue)
{
RARCH_LOG("Detaching Android input queue looper ...\n");
AInputQueue_detachLooper(android_app->inputQueue);
}
}
static void frontend_android_shutdown(bool unused)
{
(void)unused;
// Cleaner approaches don't work sadly.
exit(0);
}
static int frontend_android_get_rating(void) static int frontend_android_get_rating(void)
{ {
char device_model[PROP_VALUE_MAX]; char device_model[PROP_VALUE_MAX];