diff options
| author | Jordan Woyak <jordan.woyak@gmail.com> | 2019-10-23 17:20:42 -0500 |
|---|---|---|
| committer | Jordan Woyak <jordan.woyak@gmail.com> | 2020-09-25 20:29:18 -0500 |
| commit | b3acc7403f33033bfce6db92ea4b8ec6fc968665 (patch) | |
| tree | 3b9a068a5d9ccdead090880b4781a674cd4c361b /Source/Core/InputCommon/ControllerInterface/Device.h | |
| parent | e6ba495486b2c7ac337fa4ecd62597a0f9a56e51 (diff) | |
InputCommon: Support detecting combinations of inputs. (Hotkeys)
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Device.h')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Device.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Device.h b/Source/Core/InputCommon/ControllerInterface/Device.h index d923d97076..43e61e53fd 100644 --- a/Source/Core/InputCommon/ControllerInterface/Device.h +++ b/Source/Core/InputCommon/ControllerInterface/Device.h @@ -194,7 +194,7 @@ public: bool HasConnectedDevice(const DeviceQualifier& qualifier) const; - std::pair<std::shared_ptr<Device>, Device::Input*> + std::vector<std::pair<std::shared_ptr<Device>, Device::Input*>> DetectInput(u32 wait_ms, const std::vector<std::string>& device_strings) const; protected: |