diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2020-02-22 17:20:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-22 17:20:44 +0100 |
| commit | 2b6a1ee4d87a80418ade913e15745d78309f7f67 (patch) | |
| tree | 5989875b0c893ae1ae843a2ef6f1bad3969e39f3 /Source/Core/InputCommon/ControllerInterface/Device.cpp | |
| parent | f3c89fd6c2e190b41e7cf3a731b1a303b78f359a (diff) | |
| parent | 70ac9ad2e6faf120c8ef4859141675c33e5f33c7 (diff) | |
Merge pull request #8575 from jordan-woyak/ciface-wiimotes
InputCommon: Add support for Wii Remotes in ControllerInterface
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Device.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Device.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.cpp b/Source/Core/InputCommon/ControllerInterface/Device.cpp index d91a9e119e..15c403ca24 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Device.cpp @@ -180,7 +180,7 @@ bool DeviceQualifier::operator!=(const DeviceQualifier& devq) const std::shared_ptr<Device> DeviceContainer::FindDevice(const DeviceQualifier& devq) const { - std::lock_guard<std::mutex> lk(m_devices_mutex); + std::lock_guard lk(m_devices_mutex); for (const auto& d : m_devices) { if (devq == d.get()) @@ -192,7 +192,7 @@ std::shared_ptr<Device> DeviceContainer::FindDevice(const DeviceQualifier& devq) std::vector<std::string> DeviceContainer::GetAllDeviceStrings() const { - std::lock_guard<std::mutex> lk(m_devices_mutex); + std::lock_guard lk(m_devices_mutex); std::vector<std::string> device_strings; DeviceQualifier device_qualifier; @@ -208,7 +208,7 @@ std::vector<std::string> DeviceContainer::GetAllDeviceStrings() const std::string DeviceContainer::GetDefaultDeviceString() const { - std::lock_guard<std::mutex> lk(m_devices_mutex); + std::lock_guard lk(m_devices_mutex); if (m_devices.empty()) return ""; @@ -226,7 +226,7 @@ Device::Input* DeviceContainer::FindInput(std::string_view name, const Device* d return inp; } - std::lock_guard<std::mutex> lk(m_devices_mutex); + std::lock_guard lk(m_devices_mutex); for (const auto& d : m_devices) { Device::Input* const i = d->FindInput(name); |