diff options
| author | bunnei <bunneidev@gmail.com> | 2020-09-01 13:56:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-01 13:56:37 -0400 |
| commit | 99ae6cfc68b6413b9b07df76ee9620ffe226becc (patch) | |
| tree | 38397c8aa36cd6848ee237258e85b43ff4ab494b /src/input_common/main.cpp | |
| parent | f151cb5f713025d5a733db70c1a4b66a12af99a6 (diff) | |
| parent | ee199ead59ecd3f5e74ff3138d8a385a1d03693f (diff) | |
Merge pull request #4382 from FearlessTobi/port-udp-config
yuzu: Add motion and touch configuration from Citra
Diffstat (limited to 'src/input_common/main.cpp')
| -rw-r--r-- | src/input_common/main.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp index 57e7a25fe8..ea1a1cee63 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 |