Merge pull request #3892 from leoetlino/ciface-synchronisation

ControllerInterface: Add synchronisation

2 files changed, 6 insertions, 11 deletions

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 <sstream>
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
 
 namespace ciface
 {
 namespace Android
 {
-void Init(std::vector<Core::Device*>& 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<Core::Device*>& devices);
+void Init();
 class Touchscreen : public Core::Device
 {
 private: