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. --- .../InputCommon/ControllerInterface/Android/Android.cpp | 13 ++++--------- .../Core/InputCommon/ControllerInterface/Android/Android.h | 4 ++-- 2 files changed, 6 insertions(+), 11 deletions(-) (limited to 'Source/Core/InputCommon/ControllerInterface/Android') diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp index 3d68be633f..f6957e3ca1 100644 --- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp @@ -4,21 +4,16 @@ #include "InputCommon/ControllerInterface/Android/Android.h" #include +#include "InputCommon/ControllerInterface/ControllerInterface.h" namespace ciface { namespace Android { -void Init(std::vector& devices) +void Init() { - devices.push_back(new Touchscreen(0)); - devices.push_back(new Touchscreen(1)); - devices.push_back(new Touchscreen(2)); - devices.push_back(new Touchscreen(3)); - devices.push_back(new Touchscreen(4)); - devices.push_back(new Touchscreen(5)); - devices.push_back(new Touchscreen(6)); - devices.push_back(new Touchscreen(7)); + for (int i = 0; i < 8; ++i) + g_controller_interface.AddDevice(new Touchscreen(i)); } // Touchscreens and stuff diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/ControllerInterface/Android/Android.h index 53b578f699..29cc16d7ef 100644 --- a/Source/Core/InputCommon/ControllerInterface/Android/Android.h +++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.h @@ -4,14 +4,14 @@ #pragma once -#include "InputCommon/ControllerInterface/Device.h" +#include "InputCommon/ControllerInterface/ControllerInterface.h" #include "jni/ButtonManager.h" namespace ciface { namespace Android { -void Init(std::vector& devices); +void Init(); class Touchscreen : public Core::Device { private: -- cgit v1.2.3