summaryrefslogtreecommitdiff
path: root/src/input_common/main.cpp
diff options
context:
space:
mode:
authorGravatar Tobias2018-09-11 03:29:59 +0200
committerGravatar bunnei2018-09-10 21:29:59 -0400
commit804115b2a46d25408b34e3e08e83d3f926fd9968 (patch)
treee34636fd7928333756ef2d1282a2e2ef9c908069 /src/input_common/main.cpp
parentMerge pull request #1286 from bunnei/multi-clear (diff)
downloadyuzu-804115b2a46d25408b34e3e08e83d3f926fd9968.tar.gz
yuzu-804115b2a46d25408b34e3e08e83d3f926fd9968.tar.xz
yuzu-804115b2a46d25408b34e3e08e83d3f926fd9968.zip
Port #4141 from citra: Joystick hotplug support (#1275)
* Joystick hotplug support (#4141) * use SDL_PollEvent instead of SDL_JoystickUpdate Register hot plugged controller by GUID if they were configured in a previous session * Move SDL_PollEvent into its own thread * Don't store SDLJoystick pointer in Input Device; Get pointer on each GetStatus call * Fix that joystick_list gets cleared after SDL_Quit * Add VirtualJoystick for InputDevices thats never nullptr * fixup! Add VirtualJoystick for InputDevices thats never nullptr * fixup! fixup! Add VirtualJoystick for InputDevices thats never nullptr * Remove SDL_GameController, make SDL_Joystick* unique_ptr * fixup! Remove SDL_GameController, make SDL_Joystick* unique_ptr * Adressed feedback; fixed handling of same guid reconnects * fixup! Adressed feedback; fixed handling of same guid reconnects * merge the two joystick_lists into one * make SDLJoystick a member of VirtualJoystick * fixup! make SDLJoystick a member of VirtualJoystick * fixup! make SDLJoystick a member of VirtualJoystick * fixup! fixup! make SDLJoystick a member of VirtualJoystick * SDLJoystick: Addressed review comments * Address one missed review comment
Diffstat (limited to 'src/input_common/main.cpp')
-rw-r--r--src/input_common/main.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp
index b12623d55..37f572853 100644
--- a/src/input_common/main.cpp
+++ b/src/input_common/main.cpp
@@ -3,6 +3,7 @@
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include <memory> 5#include <memory>
6#include <thread>
6#include "common/param_package.h" 7#include "common/param_package.h"
7#include "input_common/analog_from_button.h" 8#include "input_common/analog_from_button.h"
8#include "input_common/keyboard.h" 9#include "input_common/keyboard.h"
@@ -17,6 +18,10 @@ namespace InputCommon {
17static std::shared_ptr<Keyboard> keyboard; 18static std::shared_ptr<Keyboard> keyboard;
18static std::shared_ptr<MotionEmu> motion_emu; 19static std::shared_ptr<MotionEmu> motion_emu;
19 20
21#ifdef HAVE_SDL2
22static std::thread poll_thread;
23#endif
24
20void Init() { 25void Init() {
21 keyboard = std::make_shared<Keyboard>(); 26 keyboard = std::make_shared<Keyboard>();
22 Input::RegisterFactory<Input::ButtonDevice>("keyboard", keyboard); 27 Input::RegisterFactory<Input::ButtonDevice>("keyboard", keyboard);
@@ -30,6 +35,12 @@ void Init() {
30#endif 35#endif
31} 36}
32 37
38void StartJoystickEventHandler() {
39#ifdef HAVE_SDL2
40 poll_thread = std::thread(SDL::PollLoop);
41#endif
42}
43
33void Shutdown() { 44void Shutdown() {
34 Input::UnregisterFactory<Input::ButtonDevice>("keyboard"); 45 Input::UnregisterFactory<Input::ButtonDevice>("keyboard");
35 keyboard.reset(); 46 keyboard.reset();
@@ -39,6 +50,7 @@ void Shutdown() {
39 50
40#ifdef HAVE_SDL2 51#ifdef HAVE_SDL2
41 SDL::Shutdown(); 52 SDL::Shutdown();
53 poll_thread.join();
42#endif 54#endif
43} 55}
44 56