summaryrefslogtreecommitdiff
path: root/src/input_common/main.cpp
diff options
context:
space:
mode:
authorGravatar german772021-10-20 17:53:14 -0500
committerGravatar Narr the Reg2021-11-24 20:30:25 -0600
commitaf55dd193533be577d0a3d01f93a4a3a2c27cd5d (patch)
treec9fa35290dbf470a7940b3b22249c948970b714c /src/input_common/main.cpp
parentcore/hid: Fix rumble too strong at 1% (diff)
downloadyuzu-af55dd193533be577d0a3d01f93a4a3a2c27cd5d.tar.gz
yuzu-af55dd193533be577d0a3d01f93a4a3a2c27cd5d.tar.xz
yuzu-af55dd193533be577d0a3d01f93a4a3a2c27cd5d.zip
configuration: Migrate controller settings to emulated controller
Diffstat (limited to 'src/input_common/main.cpp')
-rw-r--r--src/input_common/main.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp
index 7807dd38f..b048783c9 100644
--- a/src/input_common/main.cpp
+++ b/src/input_common/main.cpp
@@ -32,12 +32,17 @@ struct InputSubsystem::Impl {
32 keyboard = std::make_shared<Keyboard>("keyboard"); 32 keyboard = std::make_shared<Keyboard>("keyboard");
33 keyboard->SetMappingCallback(mapping_callback); 33 keyboard->SetMappingCallback(mapping_callback);
34 keyboard_factory = std::make_shared<InputFactory>(keyboard); 34 keyboard_factory = std::make_shared<InputFactory>(keyboard);
35 keyboard_output_factory = std::make_shared<OutputFactory>(keyboard);
35 Input::RegisterFactory<Input::InputDevice>(keyboard->GetEngineName(), keyboard_factory); 36 Input::RegisterFactory<Input::InputDevice>(keyboard->GetEngineName(), keyboard_factory);
37 Input::RegisterFactory<Input::OutputDevice>(keyboard->GetEngineName(),
38 keyboard_output_factory);
36 39
37 mouse = std::make_shared<Mouse>("mouse"); 40 mouse = std::make_shared<Mouse>("mouse");
38 mouse->SetMappingCallback(mapping_callback); 41 mouse->SetMappingCallback(mapping_callback);
39 mouse_factory = std::make_shared<InputFactory>(mouse); 42 mouse_factory = std::make_shared<InputFactory>(mouse);
43 mouse_output_factory = std::make_shared<OutputFactory>(mouse);
40 Input::RegisterFactory<Input::InputDevice>(mouse->GetEngineName(), mouse_factory); 44 Input::RegisterFactory<Input::InputDevice>(mouse->GetEngineName(), mouse_factory);
45 Input::RegisterFactory<Input::OutputDevice>(mouse->GetEngineName(), mouse_output_factory);
41 46
42 touch_screen = std::make_shared<TouchScreen>("touch"); 47 touch_screen = std::make_shared<TouchScreen>("touch");
43 touch_screen_factory = std::make_shared<InputFactory>(touch_screen); 48 touch_screen_factory = std::make_shared<InputFactory>(touch_screen);
@@ -61,7 +66,9 @@ struct InputSubsystem::Impl {
61 tas_input = std::make_shared<TasInput::Tas>("tas"); 66 tas_input = std::make_shared<TasInput::Tas>("tas");
62 tas_input->SetMappingCallback(mapping_callback); 67 tas_input->SetMappingCallback(mapping_callback);
63 tas_input_factory = std::make_shared<InputFactory>(tas_input); 68 tas_input_factory = std::make_shared<InputFactory>(tas_input);
69 tas_output_factory = std::make_shared<OutputFactory>(tas_input);
64 Input::RegisterFactory<Input::InputDevice>(tas_input->GetEngineName(), tas_input_factory); 70 Input::RegisterFactory<Input::InputDevice>(tas_input->GetEngineName(), tas_input_factory);
71 Input::RegisterFactory<Input::OutputDevice>(tas_input->GetEngineName(), tas_output_factory);
65 72
66#ifdef HAVE_SDL2 73#ifdef HAVE_SDL2
67 sdl = std::make_shared<SDLDriver>("sdl"); 74 sdl = std::make_shared<SDLDriver>("sdl");
@@ -268,7 +275,10 @@ struct InputSubsystem::Impl {
268 std::shared_ptr<InputFactory> udp_client_factory; 275 std::shared_ptr<InputFactory> udp_client_factory;
269 std::shared_ptr<InputFactory> tas_input_factory; 276 std::shared_ptr<InputFactory> tas_input_factory;
270 277
278 std::shared_ptr<OutputFactory> keyboard_output_factory;
279 std::shared_ptr<OutputFactory> mouse_output_factory;
271 std::shared_ptr<OutputFactory> gcadapter_output_factory; 280 std::shared_ptr<OutputFactory> gcadapter_output_factory;
281 std::shared_ptr<OutputFactory> tas_output_factory;
272 282
273#ifdef HAVE_SDL2 283#ifdef HAVE_SDL2
274 std::shared_ptr<SDLDriver> sdl; 284 std::shared_ptr<SDLDriver> sdl;