diff options
| author | Tobias <thm.frey@gmail.com> | 2018-09-11 03:29:59 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2018-09-10 21:29:59 -0400 |
| commit | 804115b2a46d25408b34e3e08e83d3f926fd9968 (patch) | |
| tree | e34636fd7928333756ef2d1282a2e2ef9c908069 /src/input_common/main.cpp | |
| parent | d6e8e16a664c7a8761f98ee690a2621e4ace6edc (diff) | |
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.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/input_common/main.cpp b/src/input_common/main.cpp index b12623d555..37f5728532 100644 --- a/src/input_common/main.cpp +++ b/src/input_common/main.cpp @@ -3,6 +3,7 @@ // Refer to the license.txt file included. #include <memory> +#include <thread> #include "common/param_package.h" #include "input_common/analog_from_button.h" #include "input_common/keyboard.h" @@ -17,6 +18,10 @@ namespace InputCommon { static std::shared_ptr<Keyboard> keyboard; static std::shared_ptr<MotionEmu> motion_emu; +#ifdef HAVE_SDL2 +static std::thread poll_thread; +#endif + void Init() { keyboard = std::make_shared<Keyboard>(); Input::RegisterFactory<Input::ButtonDevice>("keyboard", keyboard); @@ -30,6 +35,12 @@ void Init() { #endif } +void StartJoystickEventHandler() { +#ifdef HAVE_SDL2 + poll_thread = std::thread(SDL::PollLoop); +#endif +} + void Shutdown() { Input::UnregisterFactory<Input::ButtonDevice>("keyboard"); keyboard.reset(); @@ -39,6 +50,7 @@ void Shutdown() { #ifdef HAVE_SDL2 SDL::Shutdown(); + poll_thread.join(); #endif } |