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

(Menu) Refactor MENU_SETTINGS_CUSTOM_BIND_ALL

Browse Source
This commit is contained in:
twinaphex 2014-07-27 05:24:04 +02:00
parent 1d8dcbb4e7
commit 672ddd078c
1 changed files with 3 additions and 6 deletions

7
frontend/menu/backend/menu_common_backend.c

@ -4053,21 +4053,18 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
break; break;
case MENU_SETTINGS_CUSTOM_BIND_ALL: case MENU_SETTINGS_CUSTOM_BIND_ALL:
if (action == MENU_ACTION_OK) if (action == MENU_ACTION_OK)
{
if (driver.menu->bind_mode_keyboard)
{ {
driver.menu->binds.target = &g_settings.input.binds[port][0]; driver.menu->binds.target = &g_settings.input.binds[port][0];
driver.menu->binds.begin = MENU_SETTINGS_BIND_BEGIN; driver.menu->binds.begin = MENU_SETTINGS_BIND_BEGIN;
driver.menu->binds.last = MENU_SETTINGS_BIND_LAST; driver.menu->binds.last = MENU_SETTINGS_BIND_LAST;
if (driver.menu->bind_mode_keyboard)
{
file_list_push(driver.menu->menu_stack, "", MENU_SETTINGS_CUSTOM_BIND_KEYBOARD, driver.menu->selection_ptr); file_list_push(driver.menu->menu_stack, "", MENU_SETTINGS_CUSTOM_BIND_KEYBOARD, driver.menu->selection_ptr);
driver.menu->binds.timeout_end = rarch_get_time_usec() + MENU_KEYBOARD_BIND_TIMEOUT_SECONDS * 1000000; driver.menu->binds.timeout_end = rarch_get_time_usec() + MENU_KEYBOARD_BIND_TIMEOUT_SECONDS * 1000000;
input_keyboard_wait_keys(driver.menu, menu_custom_bind_keyboard_cb); input_keyboard_wait_keys(driver.menu, menu_custom_bind_keyboard_cb);
} }
else else
{ {
driver.menu->binds.target = &g_settings.input.binds[port][0];
driver.menu->binds.begin = MENU_SETTINGS_BIND_BEGIN;
driver.menu->binds.last = MENU_SETTINGS_BIND_LAST;
file_list_push(driver.menu->menu_stack, "", MENU_SETTINGS_CUSTOM_BIND, driver.menu->selection_ptr); file_list_push(driver.menu->menu_stack, "", MENU_SETTINGS_CUSTOM_BIND, driver.menu->selection_ptr);
menu_poll_bind_get_rested_axes(&driver.menu->binds); menu_poll_bind_get_rested_axes(&driver.menu->binds);
menu_poll_bind_state(&driver.menu->binds); menu_poll_bind_state(&driver.menu->binds);