mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix turning off rumbling (#14979)

Browse Source
This commit is contained in:
warmenhoven 2023-02-14 14:37:16 -05:00 committed by GitHub
parent 54b28f941d
commit c52d3484eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
input/drivers_joypad/mfi_joypad.m
View File

@ -368,7 +368,7 @@ static void mfi_joypad_autodetect_add(unsigned autoconf_pad)
id<CHHapticPatternPlayer> player = [self.engine createPlayerWithPattern:pattern error:&error];
if (error)
return nil;
player.isMuted = YES;
[player stopAtTime:0 error:&error];
return player;
}
@ -606,6 +606,8 @@ static int16_t apple_gamecontroller_joypad_state(
static bool apple_gamecontroller_joypad_set_rumble(unsigned pad,
enum retro_rumble_effect type, uint16_t strength)
{
NSError *error;
if (pad >= MAX_MFI_CONTROLLERS)
return false;
if (@available(iOS 14, tvOS 14, macOS 11, *)) {
@ -616,13 +618,9 @@ static bool apple_gamecontroller_joypad_set_rumble(unsigned pad,
if (!player)
return false;
if (strength == 0)
{
player.isMuted = YES;
return true;
}
[player stopAtTime:0 error:&error];
else
{
player.isMuted = NO;
float str = (float)strength / 65535.0f;
CHHapticDynamicParameter *param = [[CHHapticDynamicParameter alloc]
initWithParameterID:CHHapticDynamicParameterIDHapticIntensityControl
@ -632,9 +630,8 @@ static bool apple_gamecontroller_joypad_set_rumble(unsigned pad,
[player sendParameters:[NSArray arrayWithObject:param] atTime:0 error:&error];
if (!error)
[player startAtTime:0 error:&error];
return error;
}
return true;
return error;
} else {
return false;
}