diff options
| author | JMC47 <JMC4789@gmail.com> | 2026-04-03 13:54:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-04-03 13:54:58 -0400 |
| commit | 02031e663a5beefbe6aaae83893495b07a83c5b1 (patch) | |
| tree | 638da8727385e45d77198f0a970e88c6d093c8b4 /Source/Android/app/src | |
| parent | 798f581c38acfbd9196ba4884cfb9dfd6ef85684 (diff) | |
| parent | 26583fd026b4a236de332827bbf4fd91ffb18dcf (diff) | |
Merge pull request #14544 from jordan-woyak/gba-always-on-thread
HW/GBACore: Make GBAs always run on dedicated threads in preparation for future improvements.
Diffstat (limited to 'Source/Android/app/src')
3 files changed, 0 insertions, 10 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt index eab79765c6..b6a03e6b61 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.kt @@ -145,7 +145,6 @@ enum class BooleanSetting( "EnablePlayTimeTracking", true ), - MAIN_GBA_THREADS(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GBA, "Threads", true), MAIN_EXPAND_TO_CUTOUT_AREA( Settings.FILE_DOLPHIN, Settings.SECTION_INI_INTERFACE, diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt index b11a0323a0..4603411c52 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.kt @@ -705,14 +705,6 @@ class SettingsFragmentPresenter( sl.add(HeaderSetting(context, R.string.gba_settings, 0)) sl.add( - SwitchSetting( - context, - BooleanSetting.MAIN_GBA_THREADS, - R.string.gba_threads, - 0, - ) - ) - sl.add( FilePicker( context, StringSetting.MAIN_GBA_BIOS_PATH, diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml index c1c9ec4b09..5c2e978d48 100644 --- a/Source/Android/app/src/main/res/values/strings.xml +++ b/Source/Android/app/src/main/res/values/strings.xml @@ -86,7 +86,6 @@ <string name="slot_b_device">GameCube Slot B Device</string> <string name="serial_port_1_device">GameCube Serial Port 1 Device</string> <string name="gba_settings">GBA Settings</string> - <string name="gba_threads">Run GBA Cores in Dedicated Threads</string> <string name="gba_bios_path">BIOS</string> <string name="gb_player_rom">Game Boy Player ROM</string> <string name="gba_saves_path">Saves</string> |