From 5636414e315c07c322ea95466ecccab315587f22 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 15 Oct 2014 05:57:15 +0200 Subject: [PATCH] Refactor Lakka action code --- frontend/menu/backend/menu_lakka_backend.c | 22 +--------------------- frontend/menu/menu_action.c | 2 +- frontend/menu/menu_action.h | 3 +++ 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/frontend/menu/backend/menu_lakka_backend.c b/frontend/menu/backend/menu_lakka_backend.c index d3a943ccb8..d1ff11206f 100644 --- a/frontend/menu/backend/menu_lakka_backend.c +++ b/frontend/menu/backend/menu_lakka_backend.c @@ -359,27 +359,7 @@ static int menu_lakka_iterate(unsigned action) rarch_setting_t *setting = (rarch_setting_t*) active_subitem->setting; - switch (action) - { - case MENU_ACTION_OK: - if (setting->cmd_trigger.idx != RARCH_CMD_NONE) - setting->cmd_trigger.triggered = true; - /* fall-through */ - case MENU_ACTION_LEFT: - case MENU_ACTION_RIGHT: - case MENU_ACTION_START: - if (setting->type == ST_BOOL) - menu_action_setting_boolean(setting, action); - else if (setting->type == ST_UINT) - menu_action_setting_unsigned_integer(setting, action); - else if (setting->type == ST_FLOAT) - menu_action_setting_fraction(setting, action); - else if (setting->type == ST_STRING) - menu_action_setting_driver(setting, action); - break; - default: - break; - } + menu_action_handle_setting(setting, 0, action); } switch (action) diff --git a/frontend/menu/menu_action.c b/frontend/menu/menu_action.c index d2fdf6f88e..6801ac32b4 100644 --- a/frontend/menu/menu_action.c +++ b/frontend/menu/menu_action.c @@ -188,7 +188,7 @@ static int menu_entries_set_current_path_selection( return 0; } -static int menu_action_handle_setting(rarch_setting_t *setting, +int menu_action_handle_setting(rarch_setting_t *setting, unsigned type, unsigned action) { if (!setting) diff --git a/frontend/menu/menu_action.h b/frontend/menu/menu_action.h index 3f6e968311..d3e4d27544 100644 --- a/frontend/menu/menu_action.h +++ b/frontend/menu/menu_action.h @@ -47,6 +47,9 @@ int menu_action_setting_set_current_string_path( int menu_action_setting_set(unsigned type, const char *label, unsigned action); +int menu_action_handle_setting(rarch_setting_t *setting, + unsigned type, unsigned action); + #ifdef __cplusplus } #endif