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

(Cocoa) cocoa_input.c - Simplifications

Browse Source
This commit is contained in:
twinaphex 2015-07-12 08:45:12 +02:00
parent c2c9ace028
commit 32b3aa6b00
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
input/drivers/cocoa_input.c
View File

@ -361,14 +361,12 @@ static int16_t cocoa_input_state(void *data,
return 0; return 0;
} }
static bool cocoa_input_bind_button_pressed(void *data, int key) static bool cocoa_input_key_pressed(void *data, int key)
{ {
cocoa_input_data_t *apple = (cocoa_input_data_t*)data; cocoa_input_data_t *apple = (cocoa_input_data_t*)data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (apple && apple->joypad) return cocoa_input_is_pressed(apple, 0, settings->input.binds[0], key) ||
return cocoa_input_is_pressed(apple, 0, settings->input.binds[0], key) || input_joypad_pressed(apple->joypad, 0, settings->input.binds[0], key);
input_joypad_pressed(apple->joypad, 0, settings->input.binds[0], key);
return false;
} }
static void cocoa_input_free(void *data) static void cocoa_input_free(void *data)
@ -443,7 +441,7 @@ input_driver_t input_cocoa = {
cocoa_input_init, cocoa_input_init,
cocoa_input_poll, cocoa_input_poll,
cocoa_input_state, cocoa_input_state,
cocoa_input_bind_button_pressed, cocoa_input_key_pressed,
cocoa_input_free, cocoa_input_free,
NULL, NULL,
NULL, NULL,