diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2019-02-27 18:10:18 -0600 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2019-03-03 18:39:02 -0600 |
| commit | c389d68186ea7fa95d763d7bb55bc09e5a45c4cd (patch) | |
| tree | 9712b3e25f700cdbeb5b75652078867f5d8e548a /Source/Core/InputCommon/ControllerInterface/Device.h | |
| parent | 48b69ca01841ba724049895a83d8d88ec95d66de (diff) | |
ControllerInterface/DolphinQt: Make mapping "all devices" way less hacky.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Device.h')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Device.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h index 0ee2b31444..7d7623ba03 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.h +++ b/Source/Core/InputCommon/ControllerInterface/Device.h @@ -172,6 +172,9 @@ public: bool HasConnectedDevice(const DeviceQualifier& qualifier) const; + std::pair<std::shared_ptr<Device>, Device::Input*> + DetectInput(u32 wait_ms, std::vector<std::string> device_strings); + protected: mutable std::mutex m_devices_mutex; std::vector<std::shared_ptr<Device>> m_devices; |