diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2021-11-20 19:38:09 +0100 |
|---|---|---|
| committer | Admiral H. Curtiss <pikachu025@gmail.com> | 2021-11-22 00:35:35 +0100 |
| commit | 83ad84061e05fd7d07998757aa3fc9622066573f (patch) | |
| tree | 7b217f00eb4b7a6171285989f36f5057bdd6b939 /Source/Android/jni/MainAndroid.cpp | |
| parent | d5b917a6c2d25926c5aa057fdaf8fce5debb3182 (diff) | |
Core/Boot: Refactor storage of boot-to-savestate data into a separate class.
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index c08106ee4f..4b94996796 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -549,8 +549,7 @@ static float GetRenderSurfaceScale(JNIEnv* env) } static void Run(JNIEnv* env, const std::vector<std::string>& paths, bool riivolution, - const std::optional<std::string>& savestate_path = {}, - bool delete_savestate = false) + BootSessionData boot_session_data = BootSessionData()) { ASSERT(!paths.empty()); __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Running : %s", paths[0].c_str()); @@ -561,9 +560,8 @@ static void Run(JNIEnv* env, const std::vector<std::string>& paths, bool riivolu s_have_wm_user_stop = false; - std::unique_ptr<BootParameters> boot = BootParameters::GenerateFromFile(paths, savestate_path); - if (boot) - boot->delete_savestate = delete_savestate; + std::unique_ptr<BootParameters> boot = + BootParameters::GenerateFromFile(paths, std::move(boot_session_data)); if (riivolution && std::holds_alternative<BootParameters::Disc>(boot->parameters)) { @@ -638,8 +636,10 @@ Java_org_dolphinemu_dolphinemu_NativeLibrary_Run___3Ljava_lang_String_2ZLjava_la JNIEnv* env, jclass, jobjectArray jPaths, jboolean jRiivolution, jstring jSavestate, jboolean jDeleteSavestate) { - Run(env, JStringArrayToVector(env, jPaths), jRiivolution, GetJString(env, jSavestate), - jDeleteSavestate); + DeleteSavestateAfterBoot delete_state = + jDeleteSavestate ? DeleteSavestateAfterBoot::Yes : DeleteSavestateAfterBoot::No; + Run(env, JStringArrayToVector(env, jPaths), jRiivolution, + BootSessionData(GetJString(env, jSavestate), delete_state)); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_ChangeDisc(JNIEnv* env, jclass, |