diff options
| author | Léo Lam <leo@leolam.fr> | 2021-04-12 12:49:29 +0200 |
|---|---|---|
| committer | Léo Lam <leo@leolam.fr> | 2021-04-12 18:16:56 +0200 |
| commit | 336518049d0c1d63dbdfd9dcd55d1e84fcb5ba21 (patch) | |
| tree | 76d8b451af0692be64f25d3c051a59001b5d2d9c /Source/Core/DolphinQt/MenuBar.cpp | |
| parent | 136f59b434e8bdaf678f5b1888ba641e7031c568 (diff) | |
WiiUtils: Add helper functions to get emulated/real Bluetooth device
This adds a function to get the emulated or real Bluetooth device for
an active emulation instance. This lets us deduplicate all the
`ios->GetDeviceByName("/dev/usb/oh1/57e/305")` calls that are currently
scattered in the codebase and ensures Bluetooth passthrough is being
handled correctly.
This also fixes the broken check in WiimoteCommon::UpdateSource.
There was a confusion between "emulated Bluetooth" (as opposed to
"real Bluetooth" aka Bluetooth passthrough) and "emulated Wiimote".
Diffstat (limited to 'Source/Core/DolphinQt/MenuBar.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/MenuBar.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/Core/DolphinQt/MenuBar.cpp b/Source/Core/DolphinQt/MenuBar.cpp index 5b590abf14..38f16744ac 100644 --- a/Source/Core/DolphinQt/MenuBar.cpp +++ b/Source/Core/DolphinQt/MenuBar.cpp @@ -1023,12 +1023,8 @@ void MenuBar::UpdateToolsMenu(bool emulation_started) m_perform_online_update_for_current_region->setEnabled(tmd.IsValid()); } - const auto ios = IOS::HLE::GetIOS(); - const auto bt = ios ? std::static_pointer_cast<IOS::HLE::BluetoothEmuDevice>( - ios->GetDeviceByName("/dev/usb/oh1/57e/305")) : - nullptr; - const bool enable_wiimotes = - emulation_started && bt && !SConfig::GetInstance().m_bt_passthrough_enabled; + const auto bt = WiiUtils::GetBluetoothEmuDevice(); + const bool enable_wiimotes = emulation_started && bt != nullptr; for (std::size_t i = 0; i < m_wii_remotes.size(); i++) { |