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

Pass settings struct around

Browse Source
This commit is contained in:
twinaphex 2017-05-06 06:46:48 +02:00
parent 558cb64438
commit d9c5013d42
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
input/input_driver.c
View File

@ -662,6 +662,7 @@ static bool input_driver_toggle_button_combo(
* Returns: Input sample containg a mask of all pressed keys. * Returns: Input sample containg a mask of all pressed keys.
*/ */
uint64_t input_menu_keys_pressed( uint64_t input_menu_keys_pressed(
void *data,
uint64_t old_input, uint64_t old_input,
uint64_t *last_input, uint64_t *last_input,
uint64_t *trigger_input, uint64_t *trigger_input,
@ -675,13 +676,13 @@ uint64_t input_menu_keys_pressed(
unsigned i; unsigned i;
rarch_joypad_info_t joypad_info; rarch_joypad_info_t joypad_info;
const struct retro_keybind *binds[MAX_USERS] = {NULL}; const struct retro_keybind *binds[MAX_USERS] = {NULL};
settings_t *settings = config_get_ptr(); settings_t *settings = (settings_t*)data;
const struct retro_keybind *binds_norm = NULL; const struct retro_keybind *binds_norm = NULL;
const struct retro_keybind *binds_auto = NULL; const struct retro_keybind *binds_auto = NULL;
unsigned max_users = settings->uints.input_max_users; unsigned max_users = settings->uints.input_max_users;
if (settings->bools.menu_unified_controls && !menu_input_dialog_get_display_kb()) if (settings->bools.menu_unified_controls && !menu_input_dialog_get_display_kb())
return input_keys_pressed(old_input, last_input, return input_keys_pressed(settings, old_input, last_input,
trigger_input, runloop_paused, nonblock_state); trigger_input, runloop_paused, nonblock_state);
for (i = 0; i < max_users; i++) for (i = 0; i < max_users; i++)
@ -896,6 +897,7 @@ static INLINE bool input_keys_pressed_internal(
* Returns: Input sample containg a mask of all pressed keys. * Returns: Input sample containg a mask of all pressed keys.
*/ */
uint64_t input_keys_pressed( uint64_t input_keys_pressed(
void *data,
uint64_t old_input, uint64_t old_input,
uint64_t *last_input, uint64_t *last_input,
uint64_t *trigger_input, uint64_t *trigger_input,
@ -905,7 +907,7 @@ uint64_t input_keys_pressed(
unsigned i; unsigned i;
rarch_joypad_info_t joypad_info; rarch_joypad_info_t joypad_info;
uint64_t ret = 0; uint64_t ret = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = (settings_t*)data;
const struct retro_keybind *binds = input_config_binds[0]; const struct retro_keybind *binds = input_config_binds[0];
const struct retro_keybind *binds_auto = &input_autoconf_binds[0][RARCH_ENABLE_HOTKEY]; const struct retro_keybind *binds_auto = &input_autoconf_binds[0][RARCH_ENABLE_HOTKEY];
const struct retro_keybind *binds_norm = &binds[RARCH_ENABLE_HOTKEY]; const struct retro_keybind *binds_norm = &binds[RARCH_ENABLE_HOTKEY];

2
input/input_driver.h
View File

@ -257,6 +257,7 @@ int16_t input_state(unsigned port, unsigned device,
unsigned idx, unsigned id); unsigned idx, unsigned id);
uint64_t input_keys_pressed( uint64_t input_keys_pressed(
void *data,
uint64_t old_input, uint64_t old_input,
uint64_t *last_input, uint64_t *last_input,
uint64_t *trigger_input, uint64_t *trigger_input,
@ -265,6 +266,7 @@ uint64_t input_keys_pressed(
#ifdef HAVE_MENU #ifdef HAVE_MENU
uint64_t input_menu_keys_pressed( uint64_t input_menu_keys_pressed(
void *data,
uint64_t old_input, uint64_t old_input,
uint64_t *last_input, uint64_t *last_input,
uint64_t *trigger_input, uint64_t *trigger_input,

4
runloop.c
View File

@ -1068,11 +1068,11 @@ int runloop_iterate(unsigned *sleep_ms)
#ifdef HAVE_MENU #ifdef HAVE_MENU
menu_is_alive ? menu_is_alive ?
input_menu_keys_pressed(old_input, input_menu_keys_pressed(settings, old_input,
&last_input, &trigger_input, runloop_paused, &last_input, &trigger_input, runloop_paused,
&input_driver_is_nonblock) : &input_driver_is_nonblock) :
#endif #endif
input_keys_pressed(old_input, &last_input, input_keys_pressed(settings, old_input, &last_input,
&trigger_input, runloop_paused, &trigger_input, runloop_paused,
&input_driver_is_nonblock); &input_driver_is_nonblock);