diff options
| author | JosJuice <josjuice@gmail.com> | 2026-04-25 14:57:58 +0200 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2026-06-28 10:43:31 +0200 |
| commit | 200e26c98acad07e1531b325de0a6015ed90d938 (patch) | |
| tree | b5e25f8020f264473d87ae0a400e121f140d526f /Source/Android/app/src/main/java | |
| parent | 32ee8ad7ca618669f595f845aff4d59e1eb20511 (diff) | |
Core: Remove SerialInterfaceManager::ChangeDevice
Now SerialInterfaceManager::UpdateDevices reads the configured SI
devices directly from Config instead.
The main reason why I wanted to do this is so that Android can change SI
devices while emulation is running. (Android didn't have the code for
calling ChangeDevice.) But when implementing the change, I noticed that
NetPlay and Movie were using ChangeDevice as a way of overriding the SI
devices configured by the user. Replacing this ended up making the change
larger than I first anticipated.
For Wii Remotes, there was no equivalent to ChangeDevice, so NetPlay and
Movie were using Config::SetCurrent to override the Wii Remote source
configured by the user. If we can use the config system to override Wii
Remote sources, why not do the same for SI devices? This commit makes
NetPlay and Movie set SI devices and Wii Remote sources in the NetPlay
and Movie config layers, as that is the conceptually appropriate place
to do it.
As far as I can tell, the old Movie code for overriding SI devices and
Wii Remote sources didn't actually work. This new code does. I didn't
investigate exactly why it didn't work, but maybe it's because loading
a movie happens before emulation actually starts.
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.kt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.kt index 1802357e0d..84ae167ad7 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.kt @@ -209,11 +209,7 @@ enum class IntSetting( MAIN_SLOT_A, MAIN_SLOT_B, MAIN_SERIAL_PORT_1, - MAIN_FALLBACK_REGION, - MAIN_SI_DEVICE_0, - MAIN_SI_DEVICE_1, - MAIN_SI_DEVICE_2, - MAIN_SI_DEVICE_3 + MAIN_FALLBACK_REGION ) private val NOT_RUNTIME_EDITABLE: Set<IntSetting> = |