diff options
| author | 2021-04-15 21:40:35 -0700 | |
|---|---|---|
| committer | 2021-04-15 21:40:35 -0700 | |
| commit | 0a5bc8ec14619080cabe3168a1b82c6da4a63a0f (patch) | |
| tree | d35eebf5da42ebbe24d521c90d2139c94b68f8e8 /src/input_common/sdl/sdl_impl.h | |
| parent | Merge pull request #6199 from lioncash/log-ns (diff) | |
| parent | InputCommon: Name properly xbox 360 and one controllers, Fix mappings for Nin... (diff) | |
| download | yuzu-0a5bc8ec14619080cabe3168a1b82c6da4a63a0f.tar.gz yuzu-0a5bc8ec14619080cabe3168a1b82c6da4a63a0f.tar.xz yuzu-0a5bc8ec14619080cabe3168a1b82c6da4a63a0f.zip | |
Merge pull request #6119 from german77/SDLMapping
InputCommon: Address mapping and naming issues with SDL2
Diffstat (limited to 'src/input_common/sdl/sdl_impl.h')
| -rw-r--r-- | src/input_common/sdl/sdl_impl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/input_common/sdl/sdl_impl.h b/src/input_common/sdl/sdl_impl.h index 08044b00d..8b7363f56 100644 --- a/src/input_common/sdl/sdl_impl.h +++ b/src/input_common/sdl/sdl_impl.h | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include "input_common/sdl/sdl.h" | 14 | #include "input_common/sdl/sdl.h" |
| 15 | 15 | ||
| 16 | union SDL_Event; | 16 | union SDL_Event; |
| 17 | using SDL_GameController = struct _SDL_GameController; | ||
| 17 | using SDL_Joystick = struct _SDL_Joystick; | 18 | using SDL_Joystick = struct _SDL_Joystick; |
| 18 | using SDL_JoystickID = s32; | 19 | using SDL_JoystickID = s32; |
| 19 | 20 | ||
| @@ -64,6 +65,9 @@ private: | |||
| 64 | /// Needs to be called before SDL_QuitSubSystem. | 65 | /// Needs to be called before SDL_QuitSubSystem. |
| 65 | void CloseJoysticks(); | 66 | void CloseJoysticks(); |
| 66 | 67 | ||
| 68 | /// Returns a custom name for specific controllers because the default name is not correct | ||
| 69 | std::string GetControllerName(SDL_GameController* controller) const; | ||
| 70 | |||
| 67 | // Set to true if SDL supports game controller subsystem | 71 | // Set to true if SDL supports game controller subsystem |
| 68 | bool has_gamecontroller = false; | 72 | bool has_gamecontroller = false; |
| 69 | 73 | ||