diff options
| author | JosJuice <josjuice@gmail.com> | 2017-08-23 22:32:23 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2017-08-23 22:36:21 +0200 |
| commit | f8703f90e309303fea272a0078abc4e3fa4167ed (patch) | |
| tree | eda14ce765210f22e23dc6ca0fa1a02e8ce02476 /Source/Android/jni/MainAndroid.cpp | |
| parent | 4ee85a3e076f8f5569809542b8d8a8869b9b47f9 (diff) | |
MainAndroid: Remove s_filename
This fits better as a function parameter than as global state.
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 07846711e6..37795ab131 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -53,7 +53,6 @@ JavaVM* g_java_vm; namespace { ANativeWindow* s_surf; -std::string s_filename; std::string s_set_userpath; jclass s_jni_class; @@ -466,7 +465,8 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_WriteProfileResults(JNIEnv* env, jobject obj); JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_CacheClassesAndMethods(JNIEnv* env, jobject obj); -JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv* env, jobject obj); +JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv* env, jobject obj, + jstring jFile); JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SurfaceChanged(JNIEnv* env, jobject obj, jobject surf); @@ -633,13 +633,6 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetConfig( ini.Save(File::GetUserPath(D_CONFIG_IDX) + std::string(file)); } -JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SetFilename(JNIEnv* env, - jobject obj, - jstring jFile) -{ - s_filename = GetJString(env, jFile); -} - JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_SaveState(JNIEnv* env, jobject obj, jint slot) @@ -773,9 +766,11 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_RefreshWiimo WiimoteReal::Refresh(); } -JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv* env, jobject obj) +JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv* env, jobject obj, + jstring jFile) { - __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Running : %s", s_filename.c_str()); + const std::string path = GetJString(env, jFile); + __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Running : %s", path.c_str()); // Install our callbacks OSD::AddCallback(OSD::CallbackType::Initialization, ButtonManager::Init); @@ -791,7 +786,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv* // No use running the loop when booting fails s_have_wm_user_stop = false; - if (BootManager::BootCore(BootParameters::GenerateFromFile(s_filename))) + if (BootManager::BootCore(BootParameters::GenerateFromFile(path))) { static constexpr int TIMEOUT = 10000; static constexpr int WAIT_STEP = 25; |