summaryrefslogtreecommitdiffstats
path: root/src/input_common/main.cpp
diff options
context:
space:
mode:
authorFearlessTobi <thm.frey@gmail.com>2020-07-14 19:01:36 +0200
committerFearlessTobi <thm.frey@gmail.com>2020-08-29 18:56:34 +0200
commite6bd1fd1b8487e421f71d43b6073ee56de1a043d (patch)
tree53b383906fae814a67ae270b9b510a60f1b5df9d /src/input_common/main.cpp
parentMerge pull request #4604 from lioncash/lifetime (diff)
downloadyuzu-e6bd1fd1b8487e421f71d43b6073ee56de1a043d.tar
yuzu-e6bd1fd1b8487e421f71d43b6073ee56de1a043d.tar.gz
yuzu-e6bd1fd1b8487e421f71d43b6073ee56de1a043d.tar.bz2
yuzu-e6bd1fd1b8487e421f71d43b6073ee56de1a043d.tar.lz
yuzu-e6bd1fd1b8487e421f71d43b6073ee56de1a043d.tar.xz
yuzu-e6bd1fd1b8487e421f71d43b6073ee56de1a043d.tar.zst
yuzu-e6bd1fd1b8487e421f71d43b6073ee56de1a043d.zip
Diffstat (limited to 'src/input_common/main.cpp')
-rw-r--r--src/input_common/main.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp
index 57e7a25fe..f9d7b408f 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,11 @@ const GCButtonFactory* InputSubsystem::GetGCButtons() const {
return impl->gcbuttons.get();
}
+void ReloadInputDevices() {
+ if (udp)
+ udp->ReloadUDPClient();
+}
+
std::vector<std::unique_ptr<Polling::DevicePoller>> InputSubsystem::GetPollers(
Polling::DeviceType type) const {
#ifdef HAVE_SDL2