diff --git a/frontend/frontend.c b/frontend/frontend.c index 182a32a776..c84f61fec8 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -63,9 +63,6 @@ int main_entry_decide(signature(), args_type() args) } } - if (driver.frontend_ctx && driver.frontend_ctx->process_events) - driver.frontend_ctx->process_events(args); - return ret; } diff --git a/frontend/frontend_context.h b/frontend/frontend_context.h index 5d30b41ea7..a436f5fc92 100644 --- a/frontend/frontend_context.h +++ b/frontend/frontend_context.h @@ -59,7 +59,6 @@ typedef struct frontend_ctx_driver void (*exitspawn)(char *core_path, size_t sizeof_core_path); process_args_t process_args; - int (*process_events)(void *data); void (*exec)(const char *, bool); void (*set_fork)(bool exitspawn, bool start_game); void (*shutdown)(bool); diff --git a/frontend/platform/platform_android.c b/frontend/platform/platform_android.c index 76aafd0340..7c8af0c34a 100644 --- a/frontend/platform/platform_android.c +++ b/frontend/platform/platform_android.c @@ -657,115 +657,6 @@ static void frontend_android_get_environment_settings(int *argc, #endif } -#if 0 -static void process_pending_intent(void *data) -{ - RARCH_LOG("process_pending_intent.\n"); - JNIEnv *env; - struct android_app* android_app = (struct android_app*)data; - jstring jstr = NULL; - bool startgame = false; - - if (!android_app) - return; - - env = jni_thread_getenv(); - if (!env) - return; - - // Content - jstr = (*env)->CallObjectMethod(env, android_app->activity->clazz, - android_app->getPendingIntentFullPath); - - JNI_EXCEPTION(env); - RARCH_LOG("Checking arguments passed from intent ...\n"); - if (android_app->getPendingIntentFullPath && jstr) - { - const char *argv = (*env)->GetStringUTFChars(env, jstr, 0); - strlcpy(g_extern.fullpath, argv, sizeof(g_extern.fullpath)); - (*env)->ReleaseStringUTFChars(env, jstr, argv); - - startgame = true; - RARCH_LOG("Content Filename: [%s].\n", g_extern.fullpath); - } - - // Config file - jstr = (*env)->CallObjectMethod(env, android_app->activity->clazz, - android_app->getPendingIntentConfigPath); - - JNI_EXCEPTION(env); - if (android_app->getPendingIntentConfigPath && jstr) - { - const char *argv = (*env)->GetStringUTFChars(env, jstr, 0); - strlcpy(g_defaults.config_path, argv, sizeof(g_defaults.config_path)); - (*env)->ReleaseStringUTFChars(env, jstr, argv); - - RARCH_LOG("Config file: [%s].\n", g_extern.config_path); - } - - // Current IME - jstr = (*env)->CallObjectMethod(env, android_app->activity->clazz, - android_app->getPendingIntentIME); - - JNI_EXCEPTION(env); - if (android_app->getPendingIntentIME && jstr) - { - const char *argv = (*env)->GetStringUTFChars(env, jstr, 0); - strlcpy(android_app->current_ime, argv, sizeof(android_app->current_ime)); - (*env)->ReleaseStringUTFChars(env, jstr, argv); - - RARCH_LOG("Current IME: [%s].\n", android_app->current_ime); - } - - //LIBRETRO - jstr = (*env)->CallObjectMethod(env, android_app->activity->clazz, - android_app->getPendingIntentLibretroPath); - - JNI_EXCEPTION(env); - if (android_app->getPendingIntentLibretroPath && jstr) - { - const char *argv = (*env)->GetStringUTFChars(env, jstr, 0); - strlcpy(g_defaults.core_path, argv, sizeof(g_defaults.core_path)); - (*env)->ReleaseStringUTFChars(env, jstr, argv); - } - - RARCH_LOG("Libretro path: [%s].\n", g_defaults.core_path); - - if (startgame) - { - } - - CALL_VOID_METHOD(env, android_app->activity->clazz, - android_app->clearPendingIntent); -} -#endif - -static int frontend_android_process_events(void *data) -{ -#if 0 - jboolean hasPendingIntent; - JNIEnv *env; -#endif - struct android_app* android_app = (struct android_app*)data; - - if (g_extern.is_paused) - android_run_events(android_app); - -#if 0 - env = jni_thread_getenv(); - if (!env) - return -1; - - CALL_BOOLEAN_METHOD(env, hasPendingIntent, android_app->activity->clazz, - android_app->hasPendingIntent); - - if (hasPendingIntent) - process_pending_intent(android_app); -#endif - - return 0; -} - static void frontend_android_init(void *data) { JNIEnv *env; @@ -815,24 +706,6 @@ static void frontend_android_init(void *data) "onRetroArchExit", "()V"); CALL_OBJ_METHOD(env, obj, android_app->activity->clazz, android_app->getIntent); -#if 0 - GET_METHOD_ID(env, android_app->hasPendingIntent, class, - "hasPendingIntent", "()Z"); - GET_METHOD_ID(env, android_app->clearPendingIntent, class, - "clearPendingIntent", "()V"); - GET_METHOD_ID(env, android_app->getPendingIntentConfigPath, class, - "getPendingIntentConfigPath", - "()Ljava/lang/String;"); - GET_METHOD_ID(env, android_app->getPendingIntentLibretroPath, class, - "getPendingIntentLibretroPath", - "()Ljava/lang/String;"); - GET_METHOD_ID(env, android_app->getPendingIntentFullPath, class, - "getPendingIntentFullPath", - "()Ljava/lang/String;"); - GET_METHOD_ID(env, android_app->getPendingIntentIME, class, - "getPendingIntentIME", - "()Ljava/lang/String;"); -#endif GET_OBJECT_CLASS(env, class, obj); GET_METHOD_ID(env, android_app->getStringExtra, class, @@ -890,7 +763,6 @@ const frontend_ctx_driver_t frontend_ctx_android = { frontend_android_deinit, /* deinit */ NULL, /* exitspawn */ NULL, /* process_args */ - frontend_android_process_events, /* process_events */ NULL, /* exec */ NULL, /* set_fork */ frontend_android_shutdown, /* shutdown */ diff --git a/frontend/platform/platform_apple.c b/frontend/platform/platform_apple.c index 2785593376..53ffcb36bf 100644 --- a/frontend/platform/platform_apple.c +++ b/frontend/platform/platform_apple.c @@ -197,7 +197,6 @@ const frontend_ctx_driver_t frontend_ctx_apple = { NULL, /* deinit */ NULL, /* exitspawn */ NULL, /* process_args */ - NULL, /* process_events */ NULL, /* exec */ NULL, /* set_fork */ frontend_apple_shutdown, /* shutdown */ diff --git a/frontend/platform/platform_gx.c b/frontend/platform/platform_gx.c index 2b1a57dd8c..4e66b5c9cf 100644 --- a/frontend/platform/platform_gx.c +++ b/frontend/platform/platform_gx.c @@ -377,7 +377,6 @@ const frontend_ctx_driver_t frontend_ctx_gx = { NULL, /* deinit */ frontend_gx_exitspawn, /* exitspawn */ frontend_gx_process_args, /* process_args */ - NULL, /* process_events */ frontend_gx_exec, /* exec */ frontend_gx_set_fork, /* set_fork */ NULL, /* shutdown */ diff --git a/frontend/platform/platform_null.c b/frontend/platform/platform_null.c index 5e62db136a..da55a2360d 100644 --- a/frontend/platform/platform_null.c +++ b/frontend/platform/platform_null.c @@ -27,7 +27,6 @@ const frontend_ctx_driver_t frontend_ctx_null = { NULL, /* deinit */ NULL, /* exitspawn */ NULL, /* process_args */ - NULL, /* process_events */ NULL, /* exec */ NULL, /* set_fork */ NULL, /* shutdown */ diff --git a/frontend/platform/platform_ps3.c b/frontend/platform/platform_ps3.c index 17fa659899..18b92dd962 100644 --- a/frontend/platform/platform_ps3.c +++ b/frontend/platform/platform_ps3.c @@ -445,7 +445,6 @@ const frontend_ctx_driver_t frontend_ctx_ps3 = { frontend_ps3_deinit, /* deinit */ frontend_ps3_exitspawn, /* exitspawn */ NULL, /* process_args */ - NULL, /* process_events */ frontend_ps3_exec, /* exec */ frontend_ps3_set_fork, /* set_fork */ NULL, /* shutdown */ diff --git a/frontend/platform/platform_psp.c b/frontend/platform/platform_psp.c index 18f9777747..8562037eb3 100644 --- a/frontend/platform/platform_psp.c +++ b/frontend/platform/platform_psp.c @@ -238,7 +238,6 @@ const frontend_ctx_driver_t frontend_ctx_psp = { frontend_psp_deinit, /* deinit */ frontend_psp_exitspawn, /* exitspawn */ NULL, /* process_args */ - NULL, /* process_events */ frontend_psp_exec, /* exec */ frontend_psp_set_fork, /* set_fork */ frontend_psp_shutdown, /* shutdown */ diff --git a/frontend/platform/platform_qnx.c b/frontend/platform/platform_qnx.c index e7b91f2029..eb1b919006 100644 --- a/frontend/platform/platform_qnx.c +++ b/frontend/platform/platform_qnx.c @@ -65,7 +65,6 @@ const frontend_ctx_driver_t frontend_ctx_qnx = { NULL, /* deinit */ NULL, /* exitspawn */ NULL, /* process_args */ - NULL, /* process_events */ NULL, /* exec */ NULL, /* set_fork */ frontend_qnx_shutdown, /* shutdown */ diff --git a/frontend/platform/platform_xdk.c b/frontend/platform/platform_xdk.c index 0e1a9ced34..d7816b8d5b 100644 --- a/frontend/platform/platform_xdk.c +++ b/frontend/platform/platform_xdk.c @@ -328,7 +328,6 @@ const frontend_ctx_driver_t frontend_ctx_xdk = { NULL, /* deinit */ frontend_xdk_exitspawn, /* exitspawn */ NULL, /* process_args */ - NULL, /* process_events */ frontend_xdk_exec, /* exec */ frontend_xdk_set_fork, /* set_fork */ NULL, /* shutdown */