diff options
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/evdev')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp | 5 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/evdev/evdev.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp index 7a6ba50713..5da77e585a 100644 --- a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp +++ b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp @@ -9,6 +9,7 @@ #include "Common/Assert.h" #include "Common/Logging/Log.h" +#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "InputCommon/ControllerInterface/evdev/evdev.h" namespace ciface @@ -31,7 +32,7 @@ static std::string GetName(const std::string& devnode) return res; } -void Init(std::vector<Core::Device*>& controllerDevices) +void Init() { // this is used to number the joysticks // multiple joysticks with the same name shall get unique ids starting at 0 @@ -71,7 +72,7 @@ void Init(std::vector<Core::Device*>& controllerDevices) if (input->IsInteresting()) { - controllerDevices.push_back(input); + g_controller_interface.AddDevice(input); num_controllers++; } else diff --git a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h index ce7831bfdc..36c25cb42b 100644 --- a/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h +++ b/Source/Core/InputCommon/ControllerInterface/evdev/evdev.h @@ -8,13 +8,11 @@ #include <string> #include <vector> -#include "InputCommon/ControllerInterface/Device.h" - namespace ciface { namespace evdev { -void Init(std::vector<Core::Device*>& devices); +void Init(); class evdevDevice : public Core::Device { |
