libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 07:59:42 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge pull request #12227 from ToddLa/mfi-player-index

Browse Source 
prevent crash on controller connect.
This commit is contained in:
Autechre 2021-04-03 19:20:20 +02:00 committed by GitHub
commit 63e5a8b1b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
input/drivers_joypad/mfi_joypad.m
View File

@ -61,6 +61,9 @@ static void apple_gamecontroller_joypad_poll_internal(GCController *controller)
return;
slot = (uint32_t)controller.playerIndex;
// if we have not assigned a slot to this controller yet, ignore it.
if (slot >= MAX_USERS)
return;
buttons = &mfi_buttons[slot];
/* retain the values from the paused controller handler and pass them through */
@ -136,6 +139,9 @@ static void apple_gamecontroller_joypad_poll_internal(GCController *controller)
mfi_axes[slot][3] = gp.rightThumbstick.yAxis.value * 32767.0f;
}
// GCGamepad is deprecated
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated"
else if (controller.gamepad)
{
GCGamepad *gp = (GCGamepad *)controller.gamepad;
@ -151,6 +157,7 @@ static void apple_gamecontroller_joypad_poll_internal(GCController *controller)
*buttons |= gp.leftShoulder.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_L) : 0;
*buttons |= gp.rightShoulder.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_R) : 0;
}
#pragma clang diagnostic pop
}
static void apple_gamecontroller_joypad_poll(void)
@ -162,8 +169,22 @@ static void apple_gamecontroller_joypad_poll(void)
apple_gamecontroller_joypad_poll_internal(controller);
}
// GCGamepad is deprecated
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated"
static void apple_gamecontroller_joypad_register(GCGamepad *gamepad)
{
#ifdef __IPHONE_14_0
// dont let tvOS or iOS do anything with **our** buttons!!
// iOS will start a screen recording if you hold or dbl click the OPTIONS button, we dont want that.
if (@available(iOS 14.0, tvOS 14.0, *)) {
GCExtendedGamepad *gp = (GCExtendedGamepad *)gamepad.controller.extendedGamepad;
gp.buttonOptions.preferredSystemGestureState = GCSystemGestureStateDisabled;
gp.buttonMenu.preferredSystemGestureState = GCSystemGestureStateDisabled;
gp.buttonHome.preferredSystemGestureState = GCSystemGestureStateDisabled;
}
#endif
gamepad.valueChangedHandler = ^(GCGamepad *updateGamepad, GCControllerElement *element)
{
apple_gamecontroller_joypad_poll_internal(updateGamepad.controller);
@ -233,6 +254,7 @@ static void apple_gamecontroller_joypad_register(GCGamepad *gamepad)
};
}
}
#pragma clang diagnostic pop
static void mfi_joypad_autodetect_add(unsigned autoconf_pad)
{
@ -273,6 +295,9 @@ static void apple_gamecontroller_joypad_connect(GCController *controller)
}
}
// GCGamepad is deprecated
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated"
[mfiControllers addObject:controller];
// move any non-game controllers (like the siri remote) to the end
if (mfiControllers.count > 1)
@ -302,6 +327,7 @@ static void apple_gamecontroller_joypad_connect(GCController *controller)
apple_gamecontroller_joypad_register(controller.gamepad);
mfi_joypad_autodetect_add((unsigned)controller.playerIndex);
}
#pragma clang diagnostic pop
}
static void apple_gamecontroller_joypad_disconnect(GCController* controller)