diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2016-07-14 10:25:52 +0200 |
|---|---|---|
| committer | Léo Lam <leo@innovatetechnologi.es> | 2016-07-14 10:50:53 +0200 |
| commit | 788e19f54d86ba45cdc83d39c0488b17aa1d00dd (patch) | |
| tree | 38cf7b1db29bbcdb400d717806fb5900ff6bcaed /Source/Core/InputCommon/ControllerInterface/XInput | |
| parent | 89a03174ccfcc0dc80c9f59b84338f508919a555 (diff) | |
ControllerInterface: Make the ID assigning code common
This makes the device ID assigning code common to all backends, by
moving it to AddDevice() instead of copy-pasting or replicating
the logic in the backends.
Also, to prepare for hotplugging, instead of relying on a name usage
count, the new ID assigning system always starts from ID 0 and tries
to assign the first ID that is not used.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/XInput')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp | 5 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/XInput/XInput.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp index c36c3126f6..d39b0b8e1e 100644 --- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp +++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp @@ -171,11 +171,6 @@ std::string Device::GetName() const } } -int Device::GetId() const -{ - return m_index; -} - std::string Device::GetSource() const { return "XInput"; diff --git a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h index e4a047d53c..0dda9a93da 100644 --- a/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h +++ b/Source/Core/InputCommon/ControllerInterface/XInput/XInput.h @@ -92,7 +92,6 @@ public: Device(const XINPUT_CAPABILITIES& capabilities, u8 index); std::string GetName() const override; - int GetId() const override; std::string GetSource() const override; void UpdateMotors(); |