mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-04 08:35:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ControllerInterface: make real Wiimote use PlatformPopulateDevices()

Browse source
This commit is contained in:
Filoppi 2021-05-15 12:10:00 +03:00
commit 1d816f8f26
4 changed files with 38 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
View file

@ -185,7 +185,7 @@ void ControllerInterface::RefreshDevices(RefreshReason reason)
ciface::DualShockUDPClient::PopulateDevices();
#endif
WiimoteReal::ProcessWiimotePool();
WiimoteReal::PopulateDevices();
m_devices_mutex.unlock();

16
Source/Core/InputCommon/ControllerInterface/Wiimote/WiimoteController.cpp
View file

@ -128,13 +128,17 @@ void ReleaseDevices(std::optional<u32> count)
// Remove up to "count" remotes (or all of them if nullopt).
// Real wiimotes will be added to the pool.
g_controller_interface.RemoveDevice([&](const Core::Device* device) {
if (device->GetSource() != SOURCE_NAME || count == removed_devices)
return false;
// Make sure to force the device removal immediately (as they are shared ptrs and
// they could be kept alive, preventing us from re-creating the device)
g_controller_interface.RemoveDevice(
[&](const Core::Device* device) {
if (device->GetSource() != SOURCE_NAME || count == removed_devices)
return false;
++removed_devices;
return true;
});
++removed_devices;
return true;
},
true);
}
Device::Device(std::unique_ptr<WiimoteReal::Wiimote> wiimote) : m_wiimote(std::move(wiimote))