summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2019-10-28 16:39:10 +0100
committerGitHub <noreply@github.com>2019-10-28 16:39:10 +0100
commit1f3d1a9b7fa2d4729ddadfc0fc923c7730a00a49 (patch)
tree59c9aac33c104d3dc5b4039773b876cd6c389b4f /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
parenta825e7e09f8a39772b10c83db5322dc88e0f591f (diff)
parentda1f153b47a3f3f4eb9b976670bfddf68108bae9 (diff)
Merge pull request #8352 from rlnilsen/motion-controller-support-via-cemuhook-protocol
Support for motion controllers like the DualShock 4
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
index bb5ccb3f0e..35dfbde0be 100644
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
@@ -30,6 +30,9 @@
#ifdef CIFACE_USE_PIPES
#include "InputCommon/ControllerInterface/Pipes/Pipes.h"
#endif
+#ifdef CIFACE_USE_DUALSHOCKUDPCLIENT
+#include "InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.h"
+#endif
ControllerInterface g_controller_interface;
@@ -68,6 +71,9 @@ void ControllerInterface::Initialize(const WindowSystemInfo& wsi)
#ifdef CIFACE_USE_PIPES
// nothing needed
#endif
+#ifdef CIFACE_USE_DUALSHOCKUDPCLIENT
+ ciface::DualShockUDPClient::Init();
+#endif
RefreshDevices();
}
@@ -122,6 +128,9 @@ void ControllerInterface::RefreshDevices()
#ifdef CIFACE_USE_PIPES
ciface::Pipes::PopulateDevices();
#endif
+#ifdef CIFACE_USE_DUALSHOCKUDPCLIENT
+ ciface::DualShockUDPClient::PopulateDevices();
+#endif
m_is_populating_devices = false;
InvokeDevicesChangedCallbacks();
@@ -172,6 +181,9 @@ void ControllerInterface::Shutdown()
#ifdef CIFACE_USE_EVDEV
ciface::evdev::Shutdown();
#endif
+#ifdef CIFACE_USE_DUALSHOCKUDPCLIENT
+ ciface::DualShockUDPClient::DeInit();
+#endif
}
void ControllerInterface::AddDevice(std::shared_ptr<ciface::Core::Device> device)