summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/evdev
diff options
context:
space:
mode:
authorLéo Lam <leo@innovatetechnologi.es>2016-06-12 17:08:04 +0200
committerLéo Lam <leo@innovatetechnologi.es>2016-06-25 13:46:53 +0200
commitfd29e5c4cc26cd853a03ac7b0e08b367b7070c84 (patch)
tree5fdf3f210fc09344c829d1fa4b63baa4a423d97e /Source/Core/InputCommon/ControllerInterface/evdev
parent8a1bbaa56382b1bca3b95d79c716fc377c78e591 (diff)
ControllerInterface: Don't pass m_devices to the backends
Previously, the devices vector would be passed to all backends. They would then manually push_back to it to add new devices. This was fine but caused issues when trying to add synchronisation. Instead, backends now call AddDevice() to fill m_devices so that it is not accessible from the outside.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/evdev')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp5
-rw-r--r--Source/Core/InputCommon/ControllerInterface/evdev/evdev.h4
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
{