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

Merge pull request #9191 from yoshisuga/mfi_fix_detect 

iOS/tvOS/macOS: Fix autodetect for game controllers
This commit is contained in:
Twinaphex 2019-07-25 00:47:40 +02:00 committed by GitHub
parent 78915aedd1 102f27ee80
commit bb162fd044
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
input/drivers_joypad/mfi_joypad.m
View File

@ -222,6 +222,11 @@ static void apple_gamecontroller_joypad_register(GCGamepad *gamepad)
} }
} }
static void mfi_joypad_autodetect_add(unsigned autoconf_pad)
{
input_autoconfigure_connect("mFi Controller", NULL, mfi_joypad.ident, autoconf_pad, 0, 0);
}
static void apple_gamecontroller_joypad_connect(GCController *controller) static void apple_gamecontroller_joypad_connect(GCController *controller)
{ {
signed desired_index = (int32_t)controller.playerIndex; signed desired_index = (int32_t)controller.playerIndex;
@ -279,6 +284,7 @@ static void apple_gamecontroller_joypad_connect(GCController *controller)
} }
apple_gamecontroller_joypad_register(controller.gamepad); apple_gamecontroller_joypad_register(controller.gamepad);
mfi_joypad_autodetect_add(controller.playerIndex);
} }
} }
@ -290,17 +296,15 @@ static void apple_gamecontroller_joypad_disconnect(GCController* controller)
return; return;
mfi_controllers[pad] = 0; mfi_controllers[pad] = 0;
[mfiControllers removeObject:controller]; if ( [mfiControllers containsObject:controller] )
}
static void mfi_joypad_autodetect_add(unsigned autoconf_pad)
{ {
input_autoconfigure_connect("mFi Controller", NULL, mfi_joypad.ident, autoconf_pad, 0, 0); [mfiControllers removeObject:controller];
input_autoconfigure_disconnect(pad, mfi_joypad.ident);
}
} }
bool apple_gamecontroller_joypad_init(void *data) bool apple_gamecontroller_joypad_init(void *data)
{ {
mfi_joypad_autodetect_add(0);
static bool inited = false; static bool inited = false;
if (inited) if (inited)
return true; return true;