kraken: Address comments from review

start lion review
author: german77 2021-10-30 22:23:10 -0500
committer: Narr the Reg 2021-11-24 20:30:26 -0600
commit: 2b1b0c2a30e242b08ec120e09803ec54d5445703 (patch)
tree: 9a10400a7e4403b288eee3aae8a52f1d5be912de /src/input_common/main.cpp
parent: input_common: Revert deleted TAS functions (diff)
download: yuzu-2b1b0c2a30e242b08ec120e09803ec54d5445703.tar.gz
yuzu-2b1b0c2a30e242b08ec120e09803ec54d5445703.tar.xz
yuzu-2b1b0c2a30e242b08ec120e09803ec54d5445703.zip
1 files changed, 42 insertions, 34 deletions
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp
index 07d514ad7..df36a337c 100644
--- a/src/input_common/main.cpp
+++ b/src/input_common/main.cpp
@@ -33,89 +33,97 @@ struct InputSubsystem::Impl {
        keyboard->SetMappingCallback(mapping_callback);
        keyboard_factory = std::make_shared<InputFactory>(keyboard);
        keyboard_output_factory = std::make_shared<OutputFactory>(keyboard);
-        Input::RegisterFactory<Input::InputDevice>(keyboard->GetEngineName(), keyboard_factory);
+        Common::Input::RegisterFactory<Common::Input::InputDevice>(keyboard->GetEngineName(),
-        Input::RegisterFactory<Input::OutputDevice>(keyboard->GetEngineName(),
+                                                                   keyboard_factory);
-                                                    keyboard_output_factory);
+        Common::Input::RegisterFactory<Common::Input::OutputDevice>(keyboard->GetEngineName(),
+                                                                    keyboard_output_factory);
        mouse = std::make_shared<Mouse>("mouse");
        mouse->SetMappingCallback(mapping_callback);
        mouse_factory = std::make_shared<InputFactory>(mouse);
        mouse_output_factory = std::make_shared<OutputFactory>(mouse);
-        Input::RegisterFactory<Input::InputDevice>(mouse->GetEngineName(), mouse_factory);
+        Common::Input::RegisterFactory<Common::Input::InputDevice>(mouse->GetEngineName(),
-        Input::RegisterFactory<Input::OutputDevice>(mouse->GetEngineName(), mouse_output_factory);
+                                                                   mouse_factory);
+        Common::Input::RegisterFactory<Common::Input::OutputDevice>(mouse->GetEngineName(),
+                                                                    mouse_output_factory);
        touch_screen = std::make_shared<TouchScreen>("touch");
        touch_screen_factory = std::make_shared<InputFactory>(touch_screen);
-        Input::RegisterFactory<Input::InputDevice>(touch_screen->GetEngineName(),
+        Common::Input::RegisterFactory<Common::Input::InputDevice>(touch_screen->GetEngineName(),
-                                                   touch_screen_factory);
+                                                                   touch_screen_factory);
        gcadapter = std::make_shared<GCAdapter>("gcpad");
        gcadapter->SetMappingCallback(mapping_callback);
        gcadapter_input_factory = std::make_shared<InputFactory>(gcadapter);
        gcadapter_output_factory = std::make_shared<OutputFactory>(gcadapter);
-        Input::RegisterFactory<Input::InputDevice>(gcadapter->GetEngineName(),
+        Common::Input::RegisterFactory<Common::Input::InputDevice>(gcadapter->GetEngineName(),
-                                                   gcadapter_input_factory);
+                                                                   gcadapter_input_factory);
-        Input::RegisterFactory<Input::OutputDevice>(gcadapter->GetEngineName(),
+        Common::Input::RegisterFactory<Common::Input::OutputDevice>(gcadapter->GetEngineName(),
-                                                    gcadapter_output_factory);
+                                                                    gcadapter_output_factory);
        udp_client = std::make_shared<CemuhookUDP::UDPClient>("cemuhookudp");
        udp_client->SetMappingCallback(mapping_callback);
        udp_client_factory = std::make_shared<InputFactory>(udp_client);
-        Input::RegisterFactory<Input::InputDevice>(udp_client->GetEngineName(), udp_client_factory);
+        Common::Input::RegisterFactory<Common::Input::InputDevice>(udp_client->GetEngineName(),
+                                                                   udp_client_factory);
        tas_input = std::make_shared<TasInput::Tas>("tas");
        tas_input->SetMappingCallback(mapping_callback);
        tas_input_factory = std::make_shared<InputFactory>(tas_input);
        tas_output_factory = std::make_shared<OutputFactory>(tas_input);
-        Input::RegisterFactory<Input::InputDevice>(tas_input->GetEngineName(), tas_input_factory);
+        Common::Input::RegisterFactory<Common::Input::InputDevice>(tas_input->GetEngineName(),
-        Input::RegisterFactory<Input::OutputDevice>(tas_input->GetEngineName(), tas_output_factory);
+                                                                   tas_input_factory);
+        Common::Input::RegisterFactory<Common::Input::OutputDevice>(tas_input->GetEngineName(),
+                                                                    tas_output_factory);
 #ifdef HAVE_SDL2
        sdl = std::make_shared<SDLDriver>("sdl");
        sdl->SetMappingCallback(mapping_callback);
        sdl_input_factory = std::make_shared<InputFactory>(sdl);
        sdl_output_factory = std::make_shared<OutputFactory>(sdl);
-        Input::RegisterFactory<Input::InputDevice>(sdl->GetEngineName(), sdl_input_factory);
+        Common::Input::RegisterFactory<Common::Input::InputDevice>(sdl->GetEngineName(),
-        Input::RegisterFactory<Input::OutputDevice>(sdl->GetEngineName(), sdl_output_factory);
+                                                                   sdl_input_factory);
+        Common::Input::RegisterFactory<Common::Input::OutputDevice>(sdl->GetEngineName(),
+                                                                    sdl_output_factory);
 #endif
-        Input::RegisterFactory<Input::InputDevice>("touch_from_button",
+        Common::Input::RegisterFactory<Common::Input::InputDevice>(
-                                                   std::make_shared<TouchFromButton>());
+            "touch_from_button", std::make_shared<TouchFromButton>());
-        Input::RegisterFactory<Input::InputDevice>("analog_from_button",
+        Common::Input::RegisterFactory<Common::Input::InputDevice>(
-                                                   std::make_shared<StickFromButton>());
+            "analog_from_button", std::make_shared<StickFromButton>());
    }
    void Shutdown() {
-        Input::UnregisterFactory<Input::InputDevice>(keyboard->GetEngineName());
+        Common::Input::UnregisterFactory<Common::Input::InputDevice>(keyboard->GetEngineName());
-        Input::UnregisterFactory<Input::OutputDevice>(keyboard->GetEngineName());
+        Common::Input::UnregisterFactory<Common::Input::OutputDevice>(keyboard->GetEngineName());
        keyboard.reset();
-        Input::UnregisterFactory<Input::InputDevice>(mouse->GetEngineName());
+        Common::Input::UnregisterFactory<Common::Input::InputDevice>(mouse->GetEngineName());
-        Input::UnregisterFactory<Input::OutputDevice>(mouse->GetEngineName());
+        Common::Input::UnregisterFactory<Common::Input::OutputDevice>(mouse->GetEngineName());
        mouse.reset();
-        Input::UnregisterFactory<Input::InputDevice>(touch_screen->GetEngineName());
+        Common::Input::UnregisterFactory<Common::Input::InputDevice>(touch_screen->GetEngineName());
        touch_screen.reset();
-        Input::UnregisterFactory<Input::InputDevice>(gcadapter->GetEngineName());
+        Common::Input::UnregisterFactory<Common::Input::InputDevice>(gcadapter->GetEngineName());
-        Input::UnregisterFactory<Input::OutputDevice>(gcadapter->GetEngineName());
+        Common::Input::UnregisterFactory<Common::Input::OutputDevice>(gcadapter->GetEngineName());
        gcadapter.reset();
-        Input::UnregisterFactory<Input::InputDevice>(udp_client->GetEngineName());
+        Common::Input::UnregisterFactory<Common::Input::InputDevice>(udp_client->GetEngineName());
        udp_client.reset();
-        Input::UnregisterFactory<Input::InputDevice>(tas_input->GetEngineName());
+        Common::Input::UnregisterFactory<Common::Input::InputDevice>(tas_input->GetEngineName());
-        Input::UnregisterFactory<Input::OutputDevice>(tas_input->GetEngineName());
+        Common::Input::UnregisterFactory<Common::Input::OutputDevice>(tas_input->GetEngineName());
        tas_input.reset();
 #ifdef HAVE_SDL2
-        Input::UnregisterFactory<Input::InputDevice>(sdl->GetEngineName());
+        Common::Input::UnregisterFactory<Common::Input::InputDevice>(sdl->GetEngineName());
-        Input::UnregisterFactory<Input::OutputDevice>(sdl->GetEngineName());
+        Common::Input::UnregisterFactory<Common::Input::OutputDevice>(sdl->GetEngineName());
        sdl.reset();
 #endif
-        Input::UnregisterFactory<Input::InputDevice>("touch_from_button");
+        Common::Input::UnregisterFactory<Common::Input::InputDevice>("touch_from_button");
-        Input::UnregisterFactory<Input::InputDevice>("analog_from_button");
+        Common::Input::UnregisterFactory<Common::Input::InputDevice>("analog_from_button");
    }
    [[nodiscard]] std::vector<Common::ParamPackage> GetInputDevices() const {
author	german77	2021-10-30 22:23:10 -0500
committer	Narr the Reg	2021-11-24 20:30:26 -0600
commit	2b1b0c2a30e242b08ec120e09803ec54d5445703 (patch)
tree	9a10400a7e4403b288eee3aae8a52f1d5be912de /src/input_common/main.cpp
parent	input_common: Revert deleted TAS functions (diff)
download	yuzu-2b1b0c2a30e242b08ec120e09803ec54d5445703.tar.gz yuzu-2b1b0c2a30e242b08ec120e09803ec54d5445703.tar.xz yuzu-2b1b0c2a30e242b08ec120e09803ec54d5445703.zip

diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp index 07d514ad7..df36a337c 100644 --- a/src/input_common/main.cpp +++ b/src/input_common/main.cpp
@@ -33,89 +33,97 @@ struct InputSubsystem::Impl {
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	keyboard_output_factory = std::make_shared<OutputFactory>(keyboard);
36	Input::RegisterFactory<Input::InputDevice>(keyboard->GetEngineName(), keyboard_factory);	36	Common::Input::RegisterFactory<Common::Input::InputDevice>(keyboard->GetEngineName(),
37	Input::RegisterFactory<Input::OutputDevice>(keyboard->GetEngineName(),	37	keyboard_factory);
38	keyboard_output_factory);	38	Common::Input::RegisterFactory<Common::Input::OutputDevice>(keyboard->GetEngineName(),
		39	keyboard_output_factory);
39		40
40	mouse = std::make_shared<Mouse>("mouse");	41	mouse = std::make_shared<Mouse>("mouse");
41	mouse->SetMappingCallback(mapping_callback);	42	mouse->SetMappingCallback(mapping_callback);
42	mouse_factory = std::make_shared<InputFactory>(mouse);	43	mouse_factory = std::make_shared<InputFactory>(mouse);
43	mouse_output_factory = std::make_shared<OutputFactory>(mouse);	44	mouse_output_factory = std::make_shared<OutputFactory>(mouse);
44	Input::RegisterFactory<Input::InputDevice>(mouse->GetEngineName(), mouse_factory);	45	Common::Input::RegisterFactory<Common::Input::InputDevice>(mouse->GetEngineName(),
45	Input::RegisterFactory<Input::OutputDevice>(mouse->GetEngineName(), mouse_output_factory);	46	mouse_factory);
		47	Common::Input::RegisterFactory<Common::Input::OutputDevice>(mouse->GetEngineName(),
		48	mouse_output_factory);
46		49
47	touch_screen = std::make_shared<TouchScreen>("touch");	50	touch_screen = std::make_shared<TouchScreen>("touch");
48	touch_screen_factory = std::make_shared<InputFactory>(touch_screen);	51	touch_screen_factory = std::make_shared<InputFactory>(touch_screen);
49	Input::RegisterFactory<Input::InputDevice>(touch_screen->GetEngineName(),	52	Common::Input::RegisterFactory<Common::Input::InputDevice>(touch_screen->GetEngineName(),
50	touch_screen_factory);	53	touch_screen_factory);
51		54
52	gcadapter = std::make_shared<GCAdapter>("gcpad");	55	gcadapter = std::make_shared<GCAdapter>("gcpad");
53	gcadapter->SetMappingCallback(mapping_callback);	56	gcadapter->SetMappingCallback(mapping_callback);
54	gcadapter_input_factory = std::make_shared<InputFactory>(gcadapter);	57	gcadapter_input_factory = std::make_shared<InputFactory>(gcadapter);
55	gcadapter_output_factory = std::make_shared<OutputFactory>(gcadapter);	58	gcadapter_output_factory = std::make_shared<OutputFactory>(gcadapter);
56	Input::RegisterFactory<Input::InputDevice>(gcadapter->GetEngineName(),	59	Common::Input::RegisterFactory<Common::Input::InputDevice>(gcadapter->GetEngineName(),
57	gcadapter_input_factory);	60	gcadapter_input_factory);
58	Input::RegisterFactory<Input::OutputDevice>(gcadapter->GetEngineName(),	61	Common::Input::RegisterFactory<Common::Input::OutputDevice>(gcadapter->GetEngineName(),
59	gcadapter_output_factory);	62	gcadapter_output_factory);
60		63
61	udp_client = std::make_shared<CemuhookUDP::UDPClient>("cemuhookudp");	64	udp_client = std::make_shared<CemuhookUDP::UDPClient>("cemuhookudp");
62	udp_client->SetMappingCallback(mapping_callback);	65	udp_client->SetMappingCallback(mapping_callback);
63	udp_client_factory = std::make_shared<InputFactory>(udp_client);	66	udp_client_factory = std::make_shared<InputFactory>(udp_client);
64	Input::RegisterFactory<Input::InputDevice>(udp_client->GetEngineName(), udp_client_factory);	67	Common::Input::RegisterFactory<Common::Input::InputDevice>(udp_client->GetEngineName(),
		68	udp_client_factory);
65		69
66	tas_input = std::make_shared<TasInput::Tas>("tas");	70	tas_input = std::make_shared<TasInput::Tas>("tas");
67	tas_input->SetMappingCallback(mapping_callback);	71	tas_input->SetMappingCallback(mapping_callback);
68	tas_input_factory = std::make_shared<InputFactory>(tas_input);	72	tas_input_factory = std::make_shared<InputFactory>(tas_input);
69	tas_output_factory = std::make_shared<OutputFactory>(tas_input);	73	tas_output_factory = std::make_shared<OutputFactory>(tas_input);
70	Input::RegisterFactory<Input::InputDevice>(tas_input->GetEngineName(), tas_input_factory);	74	Common::Input::RegisterFactory<Common::Input::InputDevice>(tas_input->GetEngineName(),
71	Input::RegisterFactory<Input::OutputDevice>(tas_input->GetEngineName(), tas_output_factory);	75	tas_input_factory);
		76	Common::Input::RegisterFactory<Common::Input::OutputDevice>(tas_input->GetEngineName(),
		77	tas_output_factory);
72		78
73	#ifdef HAVE_SDL2	79	#ifdef HAVE_SDL2
74	sdl = std::make_shared<SDLDriver>("sdl");	80	sdl = std::make_shared<SDLDriver>("sdl");
75	sdl->SetMappingCallback(mapping_callback);	81	sdl->SetMappingCallback(mapping_callback);
76	sdl_input_factory = std::make_shared<InputFactory>(sdl);	82	sdl_input_factory = std::make_shared<InputFactory>(sdl);
77	sdl_output_factory = std::make_shared<OutputFactory>(sdl);	83	sdl_output_factory = std::make_shared<OutputFactory>(sdl);
78	Input::RegisterFactory<Input::InputDevice>(sdl->GetEngineName(), sdl_input_factory);	84	Common::Input::RegisterFactory<Common::Input::InputDevice>(sdl->GetEngineName(),
79	Input::RegisterFactory<Input::OutputDevice>(sdl->GetEngineName(), sdl_output_factory);	85	sdl_input_factory);
		86	Common::Input::RegisterFactory<Common::Input::OutputDevice>(sdl->GetEngineName(),
		87	sdl_output_factory);
80	#endif	88	#endif
81		89
82	Input::RegisterFactory<Input::InputDevice>("touch_from_button",	90	Common::Input::RegisterFactory<Common::Input::InputDevice>(
83	std::make_shared<TouchFromButton>());	91	"touch_from_button", std::make_shared<TouchFromButton>());
84	Input::RegisterFactory<Input::InputDevice>("analog_from_button",	92	Common::Input::RegisterFactory<Common::Input::InputDevice>(
85	std::make_shared<StickFromButton>());	93	"analog_from_button", std::make_shared<StickFromButton>());
86	}	94	}
87		95
88	void Shutdown() {	96	void Shutdown() {
89	Input::UnregisterFactory<Input::InputDevice>(keyboard->GetEngineName());	97	Common::Input::UnregisterFactory<Common::Input::InputDevice>(keyboard->GetEngineName());
90	Input::UnregisterFactory<Input::OutputDevice>(keyboard->GetEngineName());	98	Common::Input::UnregisterFactory<Common::Input::OutputDevice>(keyboard->GetEngineName());
91	keyboard.reset();	99	keyboard.reset();
92		100
93	Input::UnregisterFactory<Input::InputDevice>(mouse->GetEngineName());	101	Common::Input::UnregisterFactory<Common::Input::InputDevice>(mouse->GetEngineName());
94	Input::UnregisterFactory<Input::OutputDevice>(mouse->GetEngineName());	102	Common::Input::UnregisterFactory<Common::Input::OutputDevice>(mouse->GetEngineName());
95	mouse.reset();	103	mouse.reset();
96		104
97	Input::UnregisterFactory<Input::InputDevice>(touch_screen->GetEngineName());	105	Common::Input::UnregisterFactory<Common::Input::InputDevice>(touch_screen->GetEngineName());
98	touch_screen.reset();	106	touch_screen.reset();
99		107
100	Input::UnregisterFactory<Input::InputDevice>(gcadapter->GetEngineName());	108	Common::Input::UnregisterFactory<Common::Input::InputDevice>(gcadapter->GetEngineName());
101	Input::UnregisterFactory<Input::OutputDevice>(gcadapter->GetEngineName());	109	Common::Input::UnregisterFactory<Common::Input::OutputDevice>(gcadapter->GetEngineName());
102	gcadapter.reset();	110	gcadapter.reset();
103		111
104	Input::UnregisterFactory<Input::InputDevice>(udp_client->GetEngineName());	112	Common::Input::UnregisterFactory<Common::Input::InputDevice>(udp_client->GetEngineName());
105	udp_client.reset();	113	udp_client.reset();
106		114
107	Input::UnregisterFactory<Input::InputDevice>(tas_input->GetEngineName());	115	Common::Input::UnregisterFactory<Common::Input::InputDevice>(tas_input->GetEngineName());
108	Input::UnregisterFactory<Input::OutputDevice>(tas_input->GetEngineName());	116	Common::Input::UnregisterFactory<Common::Input::OutputDevice>(tas_input->GetEngineName());
109	tas_input.reset();	117	tas_input.reset();
110		118
111	#ifdef HAVE_SDL2	119	#ifdef HAVE_SDL2
112	Input::UnregisterFactory<Input::InputDevice>(sdl->GetEngineName());	120	Common::Input::UnregisterFactory<Common::Input::InputDevice>(sdl->GetEngineName());
113	Input::UnregisterFactory<Input::OutputDevice>(sdl->GetEngineName());	121	Common::Input::UnregisterFactory<Common::Input::OutputDevice>(sdl->GetEngineName());
114	sdl.reset();	122	sdl.reset();
115	#endif	123	#endif
116		124
117	Input::UnregisterFactory<Input::InputDevice>("touch_from_button");	125	Common::Input::UnregisterFactory<Common::Input::InputDevice>("touch_from_button");
118	Input::UnregisterFactory<Input::InputDevice>("analog_from_button");	126	Common::Input::UnregisterFactory<Common::Input::InputDevice>("analog_from_button");
119	}	127	}
120		128
121	[[nodiscard]] std::vector<Common::ParamPackage> GetInputDevices() const {	129	[[nodiscard]] std::vector<Common::ParamPackage> GetInputDevices() const {