Merge pull request #3892 from leoetlino/ciface-synchronisation

ControllerInterface: Add synchronisation

2 files changed, 4 insertions, 5 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
index 95bdcc4da2..fc89d8a1e6 100644
--- a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.cpp
@@ -17,6 +17,7 @@
 #include "Common/FileUtil.h"
 #include "Common/MathUtil.h"
 #include "Common/StringUtil.h"
+#include "InputCommon/ControllerInterface/ControllerInterface.h"
 #include "InputCommon/ControllerInterface/Pipes/Pipes.h"
 
 namespace ciface
@@ -40,7 +41,7 @@ static double StringToDouble(const std::string& text)
   return result;
 }
 
-void Init(std::vector<Core::Device*>& devices)
+void Init()
 {
   // Search the Pipes directory for files that we can open in read-only,
   // non-blocking mode. The device name is the virtual name of the file.
@@ -60,7 +61,7 @@ void Init(std::vector<Core::Device*>& devices)
     int fd = open(child.physicalName.c_str(), O_RDONLY | O_NONBLOCK);
     if (fd < 0)
       continue;
-    devices.push_back(new PipeDevice(fd, child.virtualName, found++));
+    g_controller_interface.AddDevice(new PipeDevice(fd, child.virtualName, found++));
   }
 }
 
diff --git a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h
index 855c45953b..66ce56ff1c 100644
--- a/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h
+++ b/Source/Core/InputCommon/ControllerInterface/Pipes/Pipes.h
@@ -8,8 +8,6 @@
 #include <string>
 #include <vector>
 
-#include "InputCommon/ControllerInterface/Device.h"
-
 namespace ciface
 {
 namespace Pipes
@@ -24,7 +22,7 @@ namespace Pipes
 // SET {L, R} [0, 1]
 // SET {MAIN, C} [0, 1] [0, 1]
 
-void Init(std::vector<Core::Device*>& devices);
+void Init();
 
 class PipeDevice : public Core::Device
 {