summaryrefslogtreecommitdiff
path: root/src/input_common/sdl/sdl.h
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/sdl/sdl.h
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 '')
-rw-r--r--src/input_common/sdl/sdl.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/input_common/sdl/sdl.h b/src/input_common/sdl/sdl.h
index 7934099d4..0206860d3 100644
--- a/src/input_common/sdl/sdl.h
+++ b/src/input_common/sdl/sdl.h
@@ -28,6 +28,15 @@ void Init();
28/// Unresisters SDL device factories and shut them down. 28/// Unresisters SDL device factories and shut them down.
29void Shutdown(); 29void Shutdown();
30 30
31/// Needs to be called before SDL_QuitSubSystem.
32void CloseSDLJoysticks();
33
34/// Handle SDL_Events for joysticks from SDL_PollEvent
35void HandleGameControllerEvent(const SDL_Event& event);
36
37/// A Loop that calls HandleGameControllerEvent until Shutdown is called
38void PollLoop();
39
31/// Creates a ParamPackage from an SDL_Event that can directly be used to create a ButtonDevice 40/// Creates a ParamPackage from an SDL_Event that can directly be used to create a ButtonDevice
32Common::ParamPackage SDLEventToButtonParamPackage(const SDL_Event& event); 41Common::ParamPackage SDLEventToButtonParamPackage(const SDL_Event& event);
33 42