diff --git a/android/app/src/main/cpp/xemu_android.cpp b/android/app/src/main/cpp/xemu_android.cpp index 2fa44e32af..10fbc05013 100644 --- a/android/app/src/main/cpp/xemu_android.cpp +++ b/android/app/src/main/cpp/xemu_android.cpp @@ -1024,7 +1024,6 @@ cleanup: struct EmulatorSettings { int surface_scale = 1; // 1, 2, or 3 - int frame_rate_limit = 60; // 30 or 60 int system_memory_mib = 64; // 64 or 128 std::string tcg_thread = "multi"; // "single" or "multi" std::string renderer = "opengl"; // "vulkan" or "opengl" @@ -1117,13 +1116,7 @@ static bool WriteConfigToml(const std::string& config_path, perf->insert_or_assign("hard_fpu", settings.hard_fpu); android->insert_or_assign("tcg_thread", (settings.tcg_thread == "single") ? "single" : "multi"); - { - int frame_rate_limit = settings.frame_rate_limit; - if (frame_rate_limit != 30 && frame_rate_limit != 60) { - frame_rate_limit = 60; - } - android->insert_or_assign("frame_rate_limit", frame_rate_limit); - } + android->insert_or_assign("frame_rate_limit", 60); if (!audio_vp->contains("num_workers")) { audio_vp->insert_or_assign("num_workers", 0); } @@ -1264,12 +1257,6 @@ static SetupFiles SyncSetupFiles() { EmulatorSettings emuSettings; emuSettings.surface_scale = GetPrefInt(env, activity, "setting_surface_scale", 1); - emuSettings.frame_rate_limit = - GetPrefInt(env, activity, "setting_frame_rate_limit", 60); - if (emuSettings.frame_rate_limit != 30 && - emuSettings.frame_rate_limit != 60) { - emuSettings.frame_rate_limit = 60; - } emuSettings.system_memory_mib = GetPrefInt(env, activity, "setting_system_memory_mib", 64); if (emuSettings.system_memory_mib != 64 && diff --git a/android/app/src/main/cpp/xemu_settings_android.cc b/android/app/src/main/cpp/xemu_settings_android.cc index b61dba0205..906afec007 100644 --- a/android/app/src/main/cpp/xemu_settings_android.cc +++ b/android/app/src/main/cpp/xemu_settings_android.cc @@ -476,16 +476,6 @@ bool xemu_settings_load(void) tcg_thread->c_str()); } } - if (auto frame_rate_limit = - android_cfg["frame_rate_limit"].value()) { - int fps = (int)*frame_rate_limit; - if (fps != 30 && fps != 60) { - fps = 60; - } - char fps_str[16]; - snprintf(fps_str, sizeof(fps_str), "%d", fps); - setenv("XEMU_ANDROID_TARGET_FPS", fps_str, 1); - } if (auto tcg_tb_size = android_cfg["tcg_tb_size"].value()) { int tb_size = (int)*tcg_tb_size; if (tb_size < 32) { diff --git a/android/app/src/main/java/com/izzy2lost/x1box/SettingsActivity.kt b/android/app/src/main/java/com/izzy2lost/x1box/SettingsActivity.kt index 3b43416461..e392560a76 100644 --- a/android/app/src/main/java/com/izzy2lost/x1box/SettingsActivity.kt +++ b/android/app/src/main/java/com/izzy2lost/x1box/SettingsActivity.kt @@ -249,7 +249,6 @@ class SettingsActivity : AppCompatActivity() { val btn2x = findViewById(R.id.btn_scale_2x) val btn3x = findViewById(R.id.btn_scale_3x) val toggleDisplayMode = findViewById(R.id.toggle_display_mode) - val toggleFrameRate = findViewById(R.id.toggle_frame_rate) val toggleSystemMemory = findViewById(R.id.toggle_system_memory) val toggleThread = findViewById(R.id.toggle_tcg_thread) val btnMulti = findViewById(R.id.btn_thread_multi) @@ -323,10 +322,8 @@ class SettingsActivity : AppCompatActivity() { else -> toggleDisplayMode.check(R.id.btn_display_stretch) } - val frameRateLimit = prefs.getInt("setting_frame_rate_limit", 60) - when (frameRateLimit) { - 30 -> toggleFrameRate.check(R.id.btn_fps_30) - else -> toggleFrameRate.check(R.id.btn_fps_60) + if (prefs.getInt("setting_frame_rate_limit", 60) != 60) { + prefs.edit().putInt("setting_frame_rate_limit", 60).apply() } val systemMemoryMiB = prefs.getInt("setting_system_memory_mib", 64) @@ -432,11 +429,6 @@ class SettingsActivity : AppCompatActivity() { R.id.btn_scale_3x -> 3 else -> 1 } - val selectedFrameRate = when (toggleFrameRate.checkedButtonId) { - R.id.btn_fps_30 -> 30 - R.id.btn_fps_60 -> 60 - else -> 60 - } val selectedThread = when (toggleThread.checkedButtonId) { R.id.btn_thread_single -> "single" else -> "multi" @@ -464,7 +456,7 @@ class SettingsActivity : AppCompatActivity() { val edit = prefs.edit() .putInt("setting_display_mode", selectedDisplayMode) .putInt("setting_surface_scale", selectedScale) - .putInt("setting_frame_rate_limit", selectedFrameRate) + .putInt("setting_frame_rate_limit", 60) .putInt("setting_system_memory_mib", selectedSystemMemoryMiB) .putString("setting_tcg_thread", selectedThread) .putBoolean("setting_use_dsp", switchDsp.isChecked) diff --git a/android/app/src/main/res/layout/activity_settings.xml b/android/app/src/main/res/layout/activity_settings.xml index 8f2b396be8..f6cb601444 100644 --- a/android/app/src/main/res/layout/activity_settings.xml +++ b/android/app/src/main/res/layout/activity_settings.xml @@ -218,40 +218,6 @@ - - - - - - - - - - Stretch 4:3 16:9 - Frame Rate Limit - 30 FPS - 60 FPS System Memory 64 MiB (Default) 128 MiB (Debug/Homebrew) diff --git a/ui/xemu.c b/ui/xemu.c index 892fbbe9e1..64c987bef4 100644 --- a/ui/xemu.c +++ b/ui/xemu.c @@ -226,7 +226,7 @@ static void xemu_android_refresh_frame_limit_from_env(void) } } - if (fps != 30 && fps != 60) { + if (fps != 60) { fps = 60; }