mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-30 07:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Android) JNI - Cache getIntent and getStringExtra jmethodIDs

Browse Source
This commit is contained in:
twinaphex 2013-11-24 17:24:41 +01:00
parent 25faefefac
commit 4c4c828c02
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
frontend/platform/platform_android.c
View File

@ -379,10 +379,7 @@ static void get_environment_settings(int argc, char *argv[], void *data)
{ {
JNIEnv *env; JNIEnv *env;
struct android_app* android_app = (struct android_app*)data; struct android_app* android_app = (struct android_app*)data;
jclass class = NULL;
jobject obj = NULL; jobject obj = NULL;
jmethodID getIntent = NULL;
jmethodID getStringExtra = NULL;
jstring jstr = NULL; jstring jstr = NULL;
bool valschanged = false; bool valschanged = false;
@ -393,17 +390,12 @@ static void get_environment_settings(int argc, char *argv[], void *data)
if (!env) if (!env)
return; return;
GET_OBJECT_CLASS(env, class, android_app->activity->clazz); CALL_OBJ_METHOD(env, obj, android_app->activity->clazz, android_app->getIntent);
GET_METHOD_ID(env, getIntent, class, "getIntent", "()Landroid/content/Intent;");
CALL_OBJ_METHOD(env, obj, android_app->activity->clazz, getIntent);
GET_OBJECT_CLASS(env, class, obj);
GET_METHOD_ID(env, getStringExtra, class, "getStringExtra", "(Ljava/lang/String;)Ljava/lang/String;");
// ROM // ROM
CALL_OBJ_METHOD_PARAM(env, jstr, obj, getStringExtra, (*env)->NewStringUTF(env, "ROM")); CALL_OBJ_METHOD_PARAM(env, jstr, obj, android_app->getStringExtra, (*env)->NewStringUTF(env, "ROM"));
if (getStringExtra && jstr) if (android_app->getStringExtra && jstr)
{ {
const char *argv = (*env)->GetStringUTFChars(env, jstr, 0); const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
strlcpy(g_extern.fullpath, argv, sizeof(g_extern.fullpath)); strlcpy(g_extern.fullpath, argv, sizeof(g_extern.fullpath));
@ -413,9 +405,9 @@ static void get_environment_settings(int argc, char *argv[], void *data)
} }
// Config file // Config file
CALL_OBJ_METHOD_PARAM(env, jstr, obj, getStringExtra, (*env)->NewStringUTF(env, "CONFIGFILE")); CALL_OBJ_METHOD_PARAM(env, jstr, obj, android_app->getStringExtra, (*env)->NewStringUTF(env, "CONFIGFILE"));
if (getStringExtra && jstr) if (android_app->getStringExtra && jstr)
{ {
const char *argv = (*env)->GetStringUTFChars(env, jstr, 0); const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
strlcpy(g_extern.config_path, argv, sizeof(g_extern.config_path)); strlcpy(g_extern.config_path, argv, sizeof(g_extern.config_path));
@ -425,9 +417,9 @@ static void get_environment_settings(int argc, char *argv[], void *data)
} }
// Current IME // Current IME
CALL_OBJ_METHOD_PARAM(env, jstr, obj, getStringExtra, (*env)->NewStringUTF(env, "IME")); CALL_OBJ_METHOD_PARAM(env, jstr, obj, android_app->getStringExtra, (*env)->NewStringUTF(env, "IME"));
if (getStringExtra && jstr) if (android_app->getStringExtra && jstr)
{ {
const char *argv = (*env)->GetStringUTFChars(env, jstr, 0); const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
strlcpy(android_app->current_ime, argv, sizeof(android_app->current_ime)); strlcpy(android_app->current_ime, argv, sizeof(android_app->current_ime));
@ -449,9 +441,9 @@ static void get_environment_settings(int argc, char *argv[], void *data)
} }
//LIBRETRO //LIBRETRO
CALL_OBJ_METHOD_PARAM(env, jstr, obj, getStringExtra, (*env)->NewStringUTF(env, "LIBRETRO")); CALL_OBJ_METHOD_PARAM(env, jstr, obj, android_app->getStringExtra, (*env)->NewStringUTF(env, "LIBRETRO"));
if (getStringExtra && jstr) if (android_app->getStringExtra && jstr)
{ {
const char *argv = (*env)->GetStringUTFChars(env, jstr, 0); const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
strlcpy(g_settings.libretro, argv, sizeof(g_settings.libretro)); strlcpy(g_settings.libretro, argv, sizeof(g_settings.libretro));
@ -474,6 +466,9 @@ static int process_events(void *data)
static void system_init(void *data) static void system_init(void *data)
{ {
JNIEnv *env;
jclass class = NULL;
jobject obj = NULL;
struct android_app* android_app = (struct android_app*)data; struct android_app* android_app = (struct android_app*)data;
ALooper* looper = ALooper_prepare(ALOOPER_PREPARE_ALLOW_NON_CALLBACKS); ALooper* looper = ALooper_prepare(ALOOPER_PREPARE_ALLOW_NON_CALLBACKS);
@ -500,6 +495,17 @@ static void system_init(void *data)
system_shutdown(android_app); system_shutdown(android_app);
} }
} }
env = jni_thread_getenv();
if (!env)
return;
GET_OBJECT_CLASS(env, class, android_app->activity->clazz);
GET_METHOD_ID(env, android_app->getIntent, class, "getIntent", "()Landroid/content/Intent;");
CALL_OBJ_METHOD(env, obj, android_app->activity->clazz, android_app->getIntent);
GET_OBJECT_CLASS(env, class, obj);
GET_METHOD_ID(env, android_app->getStringExtra, class, "getStringExtra", "(Ljava/lang/String;)Ljava/lang/String;");
} }
static void system_deinit(void *data) static void system_deinit(void *data)

2
frontend/platform/platform_android.h
View File

@ -47,6 +47,8 @@ struct android_app
uint64_t sensor_state_mask; uint64_t sensor_state_mask;
sthread_t *thread; sthread_t *thread;
char current_ime[PATH_MAX]; char current_ime[PATH_MAX];
jmethodID getIntent;
jmethodID getStringExtra;
}; };
enum { enum {