ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SDL: Fix joystick initialization on BSD

This commit is contained in:
Jeffrey Pfau 2016-02-20 21:44:51 -08:00
parent bc742f8aa9
commit 9c73cf536a
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -6,6 +6,7 @@ Bugfixes:
- GBA BIOS: Fix RegisterRamReset setting DISPCNT to the wrong value
- OpenGL: Correct boolean vector strcmp strings for uniforms
- Wii: Fix tilting direction
- SDL: Fix joystick initialization on BS
Misc:
- GBA: Slightly optimize GBAProcessEvents
- Qt: Add preset for DualShock 4

13
src/platform/sdl/sdl-events.c
View File

@ -57,6 +57,19 @@ bool GBASDLInitEvents(struct GBASDLEvents* context) {
SDL_JoystickListInit(&context->joysticks, nJoysticks);
if (nJoysticks > 0) {
GBASDLUpdateJoysticks(context);
// Some OSes don't do hotplug detection
if (!SDL_JoystickListSize(&context->joysticks)) {
int i;
for (i = 0; i < nJoysticks; ++i) {
struct SDL_JoystickCombo* joystick = SDL_JoystickListAppend(&context->joysticks);
joystick->joystick = SDL_JoystickOpen(i);
joystick->id = SDL_JoystickInstanceID(joystick->joystick);
joystick->index = SDL_JoystickListSize(&context->joysticks) - 1;
#if SDL_VERSION_ATLEAST(2, 0, 0)
joystick->haptic = SDL_HapticOpenFromJoystick(joystick->joystick);
#endif
}
}
}
context->playersAttached = 0;