From 788e19f54d86ba45cdc83d39c0488b17aa1d00dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Thu, 14 Jul 2016 10:25:52 +0200 Subject: 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. --- Source/Core/InputCommon/ControllerInterface/XInput/XInput.cpp | 5 ----- Source/Core/InputCommon/ControllerInterface/XInput/XInput.h | 1 - 2 files changed, 6 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/XInput') 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(); -- cgit v1.2.3