aboutsummaryrefslogtreecommitdiff
path: root/src/input_common/main.h
diff options
context:
space:
mode:
authorTobias <thm.frey@gmail.com>2018-09-11 03:29:59 +0200
committerbunnei <bunneidev@gmail.com>2018-09-10 21:29:59 -0400
commit804115b2a46d25408b34e3e08e83d3f926fd9968 (patch)
treee34636fd7928333756ef2d1282a2e2ef9c908069 /src/input_common/main.h
parentd6e8e16a664c7a8761f98ee690a2621e4ace6edc (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.h')
-rw-r--r--src/input_common/main.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/input_common/main.h b/src/input_common/main.h
index 77a0ce90b2..9eb13106e5 100644
--- a/src/input_common/main.h
+++ b/src/input_common/main.h
@@ -20,6 +20,8 @@ void Init();
/// Deregisters all built-in input device factories and shuts them down.
void Shutdown();
+void StartJoystickEventHandler();
+
class Keyboard;
/// Gets the keyboard button device factory.