diff options
| author | 2021-09-20 16:57:55 -0500 | |
|---|---|---|
| committer | 2021-11-24 20:30:22 -0600 | |
| commit | 4c6f2c2547e1d97f12ebe708fac693a6183bbc45 (patch) | |
| tree | 0abcd35f56088bbf732a92838995a465bae0f0ee /src/input_common/main.cpp | |
| parent | input_common: Create input poller and mapping (diff) | |
| download | yuzu-4c6f2c2547e1d97f12ebe708fac693a6183bbc45.tar.gz yuzu-4c6f2c2547e1d97f12ebe708fac693a6183bbc45.tar.xz yuzu-4c6f2c2547e1d97f12ebe708fac693a6183bbc45.zip | |
input_common: Move touch and analog from button. Move udp protocol
Diffstat (limited to 'src/input_common/main.cpp')
| -rw-r--r-- | src/input_common/main.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp index f3907c65a..7a5c29b40 100644 --- a/src/input_common/main.cpp +++ b/src/input_common/main.cpp | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #include <thread> | 6 | #include <thread> |
| 7 | #include "common/param_package.h" | 7 | #include "common/param_package.h" |
| 8 | #include "common/settings.h" | 8 | #include "common/settings.h" |
| 9 | #include "input_common/analog_from_button.h" | ||
| 10 | #include "input_common/gcadapter/gc_adapter.h" | 9 | #include "input_common/gcadapter/gc_adapter.h" |
| 11 | #include "input_common/gcadapter/gc_poller.h" | 10 | #include "input_common/gcadapter/gc_poller.h" |
| 12 | #include "input_common/keyboard.h" | 11 | #include "input_common/keyboard.h" |
| @@ -16,7 +15,6 @@ | |||
| 16 | #include "input_common/mouse/mouse_poller.h" | 15 | #include "input_common/mouse/mouse_poller.h" |
| 17 | #include "input_common/tas/tas_input.h" | 16 | #include "input_common/tas/tas_input.h" |
| 18 | #include "input_common/tas/tas_poller.h" | 17 | #include "input_common/tas/tas_poller.h" |
| 19 | #include "input_common/touch_from_button.h" | ||
| 20 | #include "input_common/udp/client.h" | 18 | #include "input_common/udp/client.h" |
| 21 | #include "input_common/udp/udp.h" | 19 | #include "input_common/udp/udp.h" |
| 22 | #ifdef HAVE_SDL2 | 20 | #ifdef HAVE_SDL2 |
| @@ -37,12 +35,8 @@ struct InputSubsystem::Impl { | |||
| 37 | 35 | ||
| 38 | keyboard = std::make_shared<Keyboard>(); | 36 | keyboard = std::make_shared<Keyboard>(); |
| 39 | Input::RegisterFactory<Input::ButtonDevice>("keyboard", keyboard); | 37 | Input::RegisterFactory<Input::ButtonDevice>("keyboard", keyboard); |
| 40 | Input::RegisterFactory<Input::AnalogDevice>("analog_from_button", | ||
| 41 | std::make_shared<AnalogFromButton>()); | ||
| 42 | Input::RegisterFactory<Input::MotionDevice>("keyboard", | 38 | Input::RegisterFactory<Input::MotionDevice>("keyboard", |
| 43 | std::make_shared<MotionFromButton>()); | 39 | std::make_shared<MotionFromButton>()); |
| 44 | Input::RegisterFactory<Input::TouchDevice>("touch_from_button", | ||
| 45 | std::make_shared<TouchFromButtonFactory>()); | ||
| 46 | 40 | ||
| 47 | #ifdef HAVE_SDL2 | 41 | #ifdef HAVE_SDL2 |
| 48 | sdl = SDL::Init(); | 42 | sdl = SDL::Init(); |
| @@ -75,8 +69,6 @@ struct InputSubsystem::Impl { | |||
| 75 | Input::UnregisterFactory<Input::ButtonDevice>("keyboard"); | 69 | Input::UnregisterFactory<Input::ButtonDevice>("keyboard"); |
| 76 | Input::UnregisterFactory<Input::MotionDevice>("keyboard"); | 70 | Input::UnregisterFactory<Input::MotionDevice>("keyboard"); |
| 77 | keyboard.reset(); | 71 | keyboard.reset(); |
| 78 | Input::UnregisterFactory<Input::AnalogDevice>("analog_from_button"); | ||
| 79 | Input::UnregisterFactory<Input::TouchDevice>("touch_from_button"); | ||
| 80 | #ifdef HAVE_SDL2 | 72 | #ifdef HAVE_SDL2 |
| 81 | sdl.reset(); | 73 | sdl.reset(); |
| 82 | #endif | 74 | #endif |