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/evdev/evdev.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/evdev/evdev.h') diff --git a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h index 36c25cb42b..081913fa8e 100644 --- a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h +++ b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h @@ -63,11 +63,10 @@ private: public: void UpdateInput() override; - evdevDevice(const std::string& devnode, int id); + evdevDevice(const std::string& devnode); ~evdevDevice(); std::string GetName() const override { return m_name; } - int GetId() const override { return m_id; } std::string GetSource() const override { return "evdev"; } bool IsInteresting() const { return m_initialized && m_interesting; } private: @@ -75,7 +74,6 @@ private: int m_fd; libevdev* m_dev; std::string m_name; - const int m_id; bool m_initialized; bool m_interesting; }; -- cgit v1.2.3