From 278d8abd111480abffda776a8968f027386c571c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 16 Oct 2014 18:29:19 +0200 Subject: [PATCH] Rename MENU_FILE_SWITCH to MENU_FILE_PUSH --- frontend/menu/disp/shared.h | 2 +- frontend/menu/menu_common.h | 2 +- frontend/menu/menu_entries.c | 2 +- frontend/menu/menu_entries_cbs.c | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frontend/menu/disp/shared.h b/frontend/menu/disp/shared.h index 7f76285b7f..f7aae09373 100644 --- a/frontend/menu/disp/shared.h +++ b/frontend/menu/disp/shared.h @@ -212,7 +212,7 @@ static void disp_set_label(unsigned *w, unsigned type, unsigned i, core_option_get_val(g_extern.system.core_options, type - MENU_SETTINGS_CORE_OPTION_START), type_str_size); - else if (type == MENU_FILE_SWITCH || type == MENU_FILE_LINEFEED_SWITCH) + else if (type == MENU_FILE_PUSH || type == MENU_FILE_LINEFEED_SWITCH) strlcpy(type_str, "...", type_str_size); else if (driver.menu_ctx && driver.menu_ctx->backend && driver.menu_ctx->backend->setting_set_label) diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h index c05cc02023..647d5185dd 100644 --- a/frontend/menu/menu_common.h +++ b/frontend/menu/menu_common.h @@ -77,7 +77,7 @@ typedef enum MENU_FILE_FONT, MENU_FILE_CONFIG, MENU_FILE_USE_DIRECTORY, - MENU_FILE_SWITCH, + MENU_FILE_PUSH, MENU_FILE_CARCHIVE, MENU_FILE_IN_CARCHIVE, MENU_FILE_CATEGORY, diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c index 21b6e5892f..990ee99a33 100644 --- a/frontend/menu/menu_entries.c +++ b/frontend/menu/menu_entries.c @@ -119,7 +119,7 @@ int setting_set_flags(rarch_setting_t *setting) if (setting->flags & SD_FLAG_ALLOW_INPUT) return MENU_FILE_LINEFEED; if (setting->flags & SD_FLAG_PUSH_ACTION) - return MENU_FILE_SWITCH; + return MENU_FILE_PUSH; if (setting->flags & SD_FLAG_IS_DRIVER) return MENU_FILE_DRIVER; if (setting->type == ST_PATH) diff --git a/frontend/menu/menu_entries_cbs.c b/frontend/menu/menu_entries_cbs.c index 0150b74dca..6d695a291c 100644 --- a/frontend/menu/menu_entries_cbs.c +++ b/frontend/menu/menu_entries_cbs.c @@ -977,7 +977,7 @@ static int action_ok_shader_parameters(const char *path, #ifdef HAVE_SHADER_MANAGER menu_entries_push(driver.menu->menu_stack, "", "video_shader_parameters", - MENU_FILE_SWITCH, driver.menu->selection_ptr); + MENU_FILE_PUSH, driver.menu->selection_ptr); #endif return 0; @@ -1576,9 +1576,9 @@ static int deferred_push_performance_counters(void *data, void *userdata, file_list_clear(list); file_list_push(list, "Frontend Counters", "frontend_counters", - MENU_FILE_SWITCH, 0); + MENU_FILE_PUSH, 0); file_list_push(list, "Core Counters", "core_counters", - MENU_FILE_SWITCH, 0); + MENU_FILE_PUSH, 0); if (driver.menu_ctx && driver.menu_ctx->populate_entries) driver.menu_ctx->populate_entries(driver.menu, path, label, type); @@ -1804,17 +1804,17 @@ static int deferred_push_shader_options(void *data, void *userdata, file_list_clear(list); file_list_push(list, "Apply Shader Changes", "shader_apply_changes", - MENU_FILE_SWITCH, 0); + MENU_FILE_PUSH, 0); file_list_push(list, "Default Filter", "video_shader_default_filter", 0, 0); file_list_push(list, "Load Shader Preset", "video_shader_preset", - MENU_FILE_SWITCH, 0); + MENU_FILE_PUSH, 0); file_list_push(list, "Shader Preset Save As", "video_shader_preset_save_as", MENU_FILE_LINEFEED_SWITCH, 0); file_list_push(list, "Parameters (Current)", - "video_shader_parameters", MENU_FILE_SWITCH, 0); + "video_shader_parameters", MENU_FILE_PUSH, 0); file_list_push(list, "Parameters (Menu)", - "video_shader_preset_parameters", MENU_FILE_SWITCH, 0); + "video_shader_preset_parameters", MENU_FILE_PUSH, 0); file_list_push(list, "Shader Passes", "video_shader_num_passes", 0, 0);