summaryrefslogtreecommitdiffstats
path: root/src/input_common/main.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-09-01 19:56:37 +0200
committerGitHub <noreply@github.com>2020-09-01 19:56:37 +0200
commit3dcccabd1d1c046fa9d72f6031d3b83f36b87ece (patch)
tree38397c8aa36cd6848ee237258e85b43ff4ab494b /src/input_common/main.cpp
parentMerge pull request #4588 from ReinUsesLisp/tsan-event (diff)
parentAddress second batch of reviews (diff)
downloadyuzu-3dcccabd1d1c046fa9d72f6031d3b83f36b87ece.tar
yuzu-3dcccabd1d1c046fa9d72f6031d3b83f36b87ece.tar.gz
yuzu-3dcccabd1d1c046fa9d72f6031d3b83f36b87ece.tar.bz2
yuzu-3dcccabd1d1c046fa9d72f6031d3b83f36b87ece.tar.lz
yuzu-3dcccabd1d1c046fa9d72f6031d3b83f36b87ece.tar.xz
yuzu-3dcccabd1d1c046fa9d72f6031d3b83f36b87ece.tar.zst
yuzu-3dcccabd1d1c046fa9d72f6031d3b83f36b87ece.zip
Diffstat (limited to 'src/input_common/main.cpp')
-rw-r--r--src/input_common/main.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp
index 57e7a25fe..ea1a1cee6 100644
--- a/src/input_common/main.cpp
+++ b/src/input_common/main.cpp
@@ -11,6 +11,7 @@
#include "input_common/keyboard.h"
#include "input_common/main.h"
#include "input_common/motion_emu.h"
+#include "input_common/touch_from_button.h"
#include "input_common/udp/udp.h"
#ifdef HAVE_SDL2
#include "input_common/sdl/sdl.h"
@@ -32,6 +33,8 @@ struct InputSubsystem::Impl {
std::make_shared<AnalogFromButton>());
motion_emu = std::make_shared<MotionEmu>();
Input::RegisterFactory<Input::MotionDevice>("motion_emu", motion_emu);
+ Input::RegisterFactory<Input::TouchDevice>("touch_from_button",
+ std::make_shared<TouchFromButtonFactory>());
#ifdef HAVE_SDL2
sdl = SDL::Init();
@@ -46,6 +49,7 @@ struct InputSubsystem::Impl {
Input::UnregisterFactory<Input::AnalogDevice>("analog_from_button");
Input::UnregisterFactory<Input::MotionDevice>("motion_emu");
motion_emu.reset();
+ Input::UnregisterFactory<Input::TouchDevice>("touch_from_button");
#ifdef HAVE_SDL2
sdl.reset();
#endif
@@ -171,6 +175,13 @@ const GCButtonFactory* InputSubsystem::GetGCButtons() const {
return impl->gcbuttons.get();
}
+void InputSubsystem::ReloadInputDevices() {
+ if (!impl->udp) {
+ return;
+ }
+ impl->udp->ReloadUDPClient();
+}
+
std::vector<std::unique_ptr<Polling::DevicePoller>> InputSubsystem::GetPollers(
Polling::DeviceType type) const {
#ifdef HAVE_SDL2