diff options
| author | 2018-09-11 03:29:59 +0200 | |
|---|---|---|
| committer | 2018-09-10 21:29:59 -0400 | |
| commit | 804115b2a46d25408b34e3e08e83d3f926fd9968 (patch) | |
| tree | e34636fd7928333756ef2d1282a2e2ef9c908069 /src/input_common/main.h | |
| parent | Merge pull request #1286 from bunnei/multi-clear (diff) | |
| download | yuzu-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.h')
| -rw-r--r-- | src/input_common/main.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/input_common/main.h b/src/input_common/main.h index 77a0ce90b..9eb13106e 100644 --- a/src/input_common/main.h +++ b/src/input_common/main.h | |||
| @@ -20,6 +20,8 @@ void Init(); | |||
| 20 | /// Deregisters all built-in input device factories and shuts them down. | 20 | /// Deregisters all built-in input device factories and shuts them down. |
| 21 | void Shutdown(); | 21 | void Shutdown(); |
| 22 | 22 | ||
| 23 | void StartJoystickEventHandler(); | ||
| 24 | |||
| 23 | class Keyboard; | 25 | class Keyboard; |
| 24 | 26 | ||
| 25 | /// Gets the keyboard button device factory. | 27 | /// Gets the keyboard button device factory. |