From fd29e5c4cc26cd853a03ac7b0e08b367b7070c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Sun, 12 Jun 2016 17:08:04 +0200 Subject: 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. --- Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/evdev/evdev.cpp') 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& 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& controllerDevices) if (input->IsInteresting()) { - controllerDevices.push_back(input); + g_controller_interface.AddDevice(input); num_controllers++; } else -- cgit v1.2.3