got rid of problematic 30fps option

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 &&

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<int64_t>()) {
-            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<int64_t>()) {
             int tb_size = (int)*tcg_tb_size;
             if (tb_size < 32) {

android/app/src/main/java/com/izzy2lost/x1box/SettingsActivity.kt

@@ -249,7 +249,6 @@ class SettingsActivity : AppCompatActivity() {
     val btn2x             = findViewById<MaterialButton>(R.id.btn_scale_2x)
     val btn3x             = findViewById<MaterialButton>(R.id.btn_scale_3x)
     val toggleDisplayMode = findViewById<MaterialButtonToggleGroup>(R.id.toggle_display_mode)
-    val toggleFrameRate   = findViewById<MaterialButtonToggleGroup>(R.id.toggle_frame_rate)
     val toggleSystemMemory = findViewById<MaterialButtonToggleGroup>(R.id.toggle_system_memory)
     val toggleThread      = findViewById<MaterialButtonToggleGroup>(R.id.toggle_tcg_thread)
     val btnMulti          = findViewById<MaterialButton>(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)

android/app/src/main/res/layout/activity_settings.xml

@@ -218,40 +218,6 @@
 
           </com.google.android.material.button.MaterialButtonToggleGroup>
 
-          <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="6dp"
-            android:text="@string/settings_frame_rate_limit"
-            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-            android:textColor="@color/xemu_text_muted" />
-
-          <com.google.android.material.button.MaterialButtonToggleGroup
-            android:id="@+id/toggle_frame_rate"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            app:selectionRequired="true"
-            app:singleSelection="true">
-
-            <com.google.android.material.button.MaterialButton
-              android:id="@+id/btn_fps_30"
-              style="?attr/materialButtonOutlinedStyle"
-              android:layout_width="0dp"
-              android:layout_height="wrap_content"
-              android:layout_weight="1"
-              android:text="@string/settings_frame_rate_limit_30" />
-
-            <com.google.android.material.button.MaterialButton
-              android:id="@+id/btn_fps_60"
-              style="?attr/materialButtonOutlinedStyle"
-              android:layout_width="0dp"
-              android:layout_height="wrap_content"
-              android:layout_weight="1"
-              android:text="@string/settings_frame_rate_limit_60" />
-
-          </com.google.android.material.button.MaterialButtonToggleGroup>
-
           <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

android/app/src/main/res/values/strings.xml

@@ -122,9 +122,6 @@
   <string name="settings_display_mode_stretch">Stretch</string>
   <string name="settings_display_mode_4_3">4:3</string>
   <string name="settings_display_mode_16_9">16:9</string>
-  <string name="settings_frame_rate_limit">Frame Rate Limit</string>
-  <string name="settings_frame_rate_limit_30">30 FPS</string>
-  <string name="settings_frame_rate_limit_60">60 FPS</string>
   <string name="settings_system_memory">System Memory</string>
   <string name="settings_system_memory_64">64 MiB (Default)</string>
   <string name="settings_system_memory_128">128 MiB (Debug/Homebrew)</string>

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;
     }