From b16ce98e342051ee3ce9a7e1d43752052d1b1971 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 14 Oct 2014 22:10:18 +0200 Subject: [PATCH] menu_action.c - cleanups --- frontend/menu/menu_action.c | 20 ++++++++++---------- frontend/menu/menu_action.h | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/frontend/menu/menu_action.c b/frontend/menu/menu_action.c index 033844e121..a812a59b37 100644 --- a/frontend/menu/menu_action.c +++ b/frontend/menu/menu_action.c @@ -46,9 +46,9 @@ int menu_action_setting_boolean( } int menu_action_setting_unsigned_integer( - rarch_setting_t *setting, unsigned id, unsigned action) + rarch_setting_t *setting, unsigned type, unsigned action) { - if (id == MENU_FILE_LINEFEED) + if (type == MENU_FILE_LINEFEED) { if (action == MENU_ACTION_OK) menu_key_start_line(driver.menu, setting->short_description, @@ -226,17 +226,17 @@ int menu_action_setting_set_current_string_path( int menu_action_handle_setting(rarch_setting_t *setting, - unsigned id, const char *label, unsigned action) + unsigned type, const char *label, unsigned action) { if (setting->type == ST_BOOL) return menu_action_setting_boolean(setting, action); if (setting->type == ST_UINT) - return menu_action_setting_unsigned_integer(setting, id, action); + return menu_action_setting_unsigned_integer(setting, type, action); if (setting->type == ST_FLOAT) return menu_action_setting_fraction(setting, action); if (setting->type == ST_PATH) return menu_entries_set_current_path_selection(setting, - setting->default_value.string, setting->name, id, action); + setting->default_value.string, setting->name, type, action); if (setting->type == ST_DIR) { @@ -252,7 +252,7 @@ int menu_action_handle_setting(rarch_setting_t *setting, { if ( (setting->flags & SD_FLAG_ALLOW_INPUT) || - id == MENU_FILE_LINEFEED_SWITCH) + type == MENU_FILE_LINEFEED_SWITCH) { switch (action) { @@ -360,7 +360,7 @@ unsigned menu_gx_resolutions[GX_RESOLUTIONS_LAST][2] = { unsigned menu_current_gx_resolution = GX_RESOLUTIONS_640_480; #endif -int menu_action_setting_set(unsigned id, const char *label, +int menu_action_setting_set(unsigned type, const char *label, unsigned action) { unsigned port = driver.menu->current_pad; @@ -372,7 +372,7 @@ int menu_action_setting_set(unsigned id, const char *label, driver.menu->list_settings, list->list[driver.menu->selection_ptr].label); if (setting) - return menu_action_handle_setting(setting, id, label, action); + return menu_action_handle_setting(setting, type, label, action); /* Check if setting belongs to main menu. */ @@ -380,7 +380,7 @@ int menu_action_setting_set(unsigned id, const char *label, driver.menu->list_mainmenu, list->list[driver.menu->selection_ptr].label); if (setting) - return menu_action_handle_setting(setting, id, label, action); + return menu_action_handle_setting(setting, type, label, action); /* Fallback. */ @@ -517,7 +517,7 @@ int menu_action_setting_set(unsigned id, const char *label, } else { - switch (id) + switch (type) { #if defined(GEKKO) case MENU_SETTINGS_VIDEO_RESOLUTION: diff --git a/frontend/menu/menu_action.h b/frontend/menu/menu_action.h index 20d40724fe..4ae360fcfa 100644 --- a/frontend/menu/menu_action.h +++ b/frontend/menu/menu_action.h @@ -32,7 +32,7 @@ int menu_action_setting_fraction( rarch_setting_t *setting, unsigned action); int menu_action_setting_unsigned_integer( - rarch_setting_t *setting, unsigned id, unsigned action); + rarch_setting_t *setting, unsigned type, unsigned action); void menu_action_setting_driver( rarch_setting_t *setting, unsigned action); @@ -46,11 +46,11 @@ int menu_action_setting_set_current_string( int menu_action_setting_set_current_string_path( rarch_setting_t *setting, const char *dir, const char *path); -int menu_action_setting_set(unsigned id, const char *label, +int menu_action_setting_set(unsigned type, const char *label, unsigned action); int menu_action_handle_setting(rarch_setting_t *setting, - unsigned id, const char *label, unsigned action); + unsigned type, const char *label, unsigned action); #ifdef __cplusplus }