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/Xlib | |
| 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/Xlib')
4 files changed, 0 insertions, 12 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp index c7c2e74242..59a1c64047 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp @@ -300,11 +300,6 @@ std::string KeyboardMouse::GetSource() const return "XInput2"; } -int KeyboardMouse::GetId() const -{ - return -1; -} - KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* keyboard) : m_display(display), m_keyboard(keyboard), m_keycode(keycode) { diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h index 10499ea22c..80df03db70 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.h @@ -104,7 +104,6 @@ public: std::string GetName() const override; std::string GetSource() const override; - int GetId() const override; private: Window m_window; diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp index fd5cda04ec..c0ee39ac68 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.cpp @@ -80,11 +80,6 @@ std::string KeyboardMouse::GetSource() const return "Xlib"; } -int KeyboardMouse::GetId() const -{ - return 0; -} - KeyboardMouse::Key::Key(Display* const display, KeyCode keycode, const char* keyboard) : m_display(display), m_keyboard(keyboard), m_keycode(keycode) { diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h index 18e5bad635..ef0d5777a3 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/Xlib.h @@ -81,7 +81,6 @@ public: std::string GetName() const override; std::string GetSource() const override; - int GetId() const override; private: Window m_window; |