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

(iOS GC) Get rid of superfluous inline function

Browse Source
This commit is contained in:
twinaphex 2014-07-09 13:48:43 +02:00
parent 4431989515
commit a19d2e2853
1 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
apple/common/apple_gamecontroller.m
View File

@ -27,11 +27,6 @@ static BOOL apple_gamecontroller_available(void)
return (&GCControllerDidConnectNotification && &GCControllerDidDisconnectNotification); return (&GCControllerDidConnectNotification && &GCControllerDidDisconnectNotification);
} }
static inline uint32_t joypad_value_for_id(uint32_t joypad_id)
{
return (1 << joypad_id);
}
static void apple_gamecontroller_poll(GCController *controller) static void apple_gamecontroller_poll(GCController *controller)
{ {
if (!controller || controller.playerIndex == MAX_PLAYERS) if (!controller || controller.playerIndex == MAX_PLAYERS)
@ -40,7 +35,7 @@ static void apple_gamecontroller_poll(GCController *controller)
uint32_t slot = (uint32_t)controller.playerIndex; uint32_t slot = (uint32_t)controller.playerIndex;
/* retain the start (pause) value */ /* retain the start (pause) value */
uint32_t pause = g_current_input_data.pad_buttons[slot] & joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_START); uint32_t pause = g_current_input_data.pad_buttons[slot] & (1 << RETRO_DEVICE_ID_JOYPAD_START);
g_current_input_data.pad_buttons[slot] = 0; g_current_input_data.pad_buttons[slot] = 0;
memset(g_current_input_data.pad_axis[slot], 0, sizeof(g_current_input_data.pad_axis[0])); memset(g_current_input_data.pad_axis[slot], 0, sizeof(g_current_input_data.pad_axis[0]));
@ -50,19 +45,19 @@ static void apple_gamecontroller_poll(GCController *controller)
if (controller.extendedGamepad) if (controller.extendedGamepad)
{ {
GCExtendedGamepad *gp = (GCExtendedGamepad *)controller.extendedGamepad; GCExtendedGamepad *gp = (GCExtendedGamepad *)controller.extendedGamepad;
g_current_input_data.pad_buttons[slot] |= gp.dpad.up.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_UP) : 0; g_current_input_data.pad_buttons[slot] |= gp.dpad.up.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_UP) : 0;
g_current_input_data.pad_buttons[slot] |= gp.dpad.down.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_DOWN) : 0; g_current_input_data.pad_buttons[slot] |= gp.dpad.down.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_DOWN) : 0;
g_current_input_data.pad_buttons[slot] |= gp.dpad.left.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_LEFT) : 0; g_current_input_data.pad_buttons[slot] |= gp.dpad.left.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_LEFT) : 0;
g_current_input_data.pad_buttons[slot] |= gp.dpad.right.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_RIGHT) : 0; g_current_input_data.pad_buttons[slot] |= gp.dpad.right.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT) : 0;
g_current_input_data.pad_buttons[slot] |= gp.buttonA.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_B) : 0; g_current_input_data.pad_buttons[slot] |= gp.buttonA.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_B) : 0;
g_current_input_data.pad_buttons[slot] |= gp.buttonB.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_A) : 0; g_current_input_data.pad_buttons[slot] |= gp.buttonB.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_A) : 0;
g_current_input_data.pad_buttons[slot] |= gp.buttonX.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_Y) : 0; g_current_input_data.pad_buttons[slot] |= gp.buttonX.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_Y) : 0;
g_current_input_data.pad_buttons[slot] |= gp.buttonY.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_X) : 0; g_current_input_data.pad_buttons[slot] |= gp.buttonY.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_X) : 0;
g_current_input_data.pad_buttons[slot] |= gp.leftShoulder.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_L) : 0; g_current_input_data.pad_buttons[slot] |= gp.leftShoulder.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_L) : 0;
g_current_input_data.pad_buttons[slot] |= gp.rightShoulder.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_R) : 0; g_current_input_data.pad_buttons[slot] |= gp.rightShoulder.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_R) : 0;
g_current_input_data.pad_buttons[slot] |= gp.leftTrigger.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_L2) : 0; g_current_input_data.pad_buttons[slot] |= gp.leftTrigger.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_L2) : 0;
g_current_input_data.pad_buttons[slot] |= gp.rightTrigger.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_R2) : 0; g_current_input_data.pad_buttons[slot] |= gp.rightTrigger.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_R2) : 0;
g_current_input_data.pad_axis[slot][0] = gp.leftThumbstick.xAxis.value * 32767.0f; g_current_input_data.pad_axis[slot][0] = gp.leftThumbstick.xAxis.value * 32767.0f;
g_current_input_data.pad_axis[slot][1] = gp.leftThumbstick.yAxis.value * 32767.0f; g_current_input_data.pad_axis[slot][1] = gp.leftThumbstick.yAxis.value * 32767.0f;
g_current_input_data.pad_axis[slot][2] = gp.rightThumbstick.xAxis.value * 32767.0f; g_current_input_data.pad_axis[slot][2] = gp.rightThumbstick.xAxis.value * 32767.0f;
@ -71,16 +66,16 @@ static void apple_gamecontroller_poll(GCController *controller)
else if (controller.gamepad) else if (controller.gamepad)
{ {
GCGamepad *gp = (GCGamepad *)controller.gamepad; GCGamepad *gp = (GCGamepad *)controller.gamepad;
g_current_input_data.pad_buttons[slot] |= gp.dpad.up.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_UP) : 0; g_current_input_data.pad_buttons[slot] |= gp.dpad.up.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_UP) : 0;
g_current_input_data.pad_buttons[slot] |= gp.dpad.down.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_DOWN) : 0; g_current_input_data.pad_buttons[slot] |= gp.dpad.down.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_DOWN) : 0;
g_current_input_data.pad_buttons[slot] |= gp.dpad.left.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_LEFT) : 0; g_current_input_data.pad_buttons[slot] |= gp.dpad.left.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_LEFT) : 0;
g_current_input_data.pad_buttons[slot] |= gp.dpad.right.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_RIGHT) : 0; g_current_input_data.pad_buttons[slot] |= gp.dpad.right.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT) : 0;
g_current_input_data.pad_buttons[slot] |= gp.buttonA.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_B) : 0; g_current_input_data.pad_buttons[slot] |= gp.buttonA.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_B) : 0;
g_current_input_data.pad_buttons[slot] |= gp.buttonB.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_A) : 0; g_current_input_data.pad_buttons[slot] |= gp.buttonB.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_A) : 0;
g_current_input_data.pad_buttons[slot] |= gp.buttonX.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_Y) : 0; g_current_input_data.pad_buttons[slot] |= gp.buttonX.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_Y) : 0;
g_current_input_data.pad_buttons[slot] |= gp.buttonY.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_X) : 0; g_current_input_data.pad_buttons[slot] |= gp.buttonY.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_X) : 0;
g_current_input_data.pad_buttons[slot] |= gp.leftShoulder.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_L) : 0; g_current_input_data.pad_buttons[slot] |= gp.leftShoulder.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_L) : 0;
g_current_input_data.pad_buttons[slot] |= gp.rightShoulder.pressed ? joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_R) : 0; g_current_input_data.pad_buttons[slot] |= gp.rightShoulder.pressed ? (1 << RETRO_DEVICE_ID_JOYPAD_R) : 0;
} }
} }
@ -103,10 +98,10 @@ static void apple_gamecontroller_register(GCGamepad *gamepad)
uint32_t slot = (uint32_t)controller.playerIndex; uint32_t slot = (uint32_t)controller.playerIndex;
g_current_input_data.pad_buttons[slot] |= joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_START); g_current_input_data.pad_buttons[slot] |= (1 << RETRO_DEVICE_ID_JOYPAD_START);
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
g_current_input_data.pad_buttons[slot] &= ~joypad_value_for_id(RETRO_DEVICE_ID_JOYPAD_START); g_current_input_data.pad_buttons[slot] &= ~(1 << RETRO_DEVICE_ID_JOYPAD_START);
}); });
}; };