From 01d07721b4af0232388d3fb91cee4ec455af5c22 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 8 Jun 2015 14:30:05 +0200 Subject: [PATCH] Rename menu_entries_cbs_representation.c to menu_entries_cbs_get_value.c --- Makefile.common | 2 +- griffin/griffin.c | 2 +- ...ntation.c => menu_entries_cbs_get_value.c} | 72 +++++++++---------- menu/menu_entry.c | 4 +- menu/menu_list.h | 2 +- 5 files changed, 41 insertions(+), 41 deletions(-) rename menu/{menu_entries_cbs_representation.c => menu_entries_cbs_get_value.c} (94%) diff --git a/Makefile.common b/Makefile.common index cba3abe779..6208309a79 100644 --- a/Makefile.common +++ b/Makefile.common @@ -350,7 +350,7 @@ ifeq ($(HAVE_MENU_COMMON), 1) menu/menu_entries_cbs_right.o \ menu/menu_entries_cbs_deferred_push.o \ menu/menu_entries_cbs_scan.o \ - menu/menu_entries_cbs_representation.o \ + menu/menu_entries_cbs_get_value.o \ menu/menu_entries_cbs_iterate.o \ menu/menu_entries_cbs_title.o \ menu/menu_entries_cbs_up.o \ diff --git a/griffin/griffin.c b/griffin/griffin.c index e0350020a2..dbde5427da 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -726,7 +726,7 @@ MENU #include "../menu/menu_entries_cbs_title.c" #include "../menu/menu_entries_cbs_deferred_push.c" #include "../menu/menu_entries_cbs_scan.c" -#include "../menu/menu_entries_cbs_representation.c" +#include "../menu/menu_entries_cbs_get_value.c" #include "../menu/menu_entries_cbs_iterate.c" #include "../menu/menu_entries_cbs_up.c" #include "../menu/menu_entries_cbs_down.c" diff --git a/menu/menu_entries_cbs_representation.c b/menu/menu_entries_cbs_get_value.c similarity index 94% rename from menu/menu_entries_cbs_representation.c rename to menu/menu_entries_cbs_get_value.c index 13162bd2c5..ac6a41baf9 100644 --- a/menu/menu_entries_cbs_representation.c +++ b/menu/menu_entries_cbs_get_value.c @@ -796,39 +796,39 @@ static int menu_entries_cbs_init_bind_get_string_representation_compare_label( switch (label_hash) { case MENU_LABEL_CHEAT_NUM_PASSES: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_cheat_num_passes; break; case MENU_LABEL_REMAP_FILE_LOAD: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_remap_file_load; break; case MENU_LABEL_VIDEO_SHADER_FILTER_PASS: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_shader_filter_pass; break; case MENU_LABEL_VIDEO_SHADER_SCALE_PASS: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_shader_scale_pass; break; case MENU_LABEL_VIDEO_SHADER_NUM_PASSES: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_shader_num_passes; break; case MENU_LABEL_VIDEO_SHADER_PASS: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_shader_pass; break; case MENU_LABEL_VIDEO_SHADER_DEFAULT_FILTER: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_shader_default_filter; break; case MENU_LABEL_VIDEO_FILTER: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_filter; break; case MENU_LABEL_CONFIGURATIONS: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_configurations; break; default: @@ -843,118 +843,118 @@ static int menu_entries_cbs_init_bind_get_string_representation_compare_type( { if (type >= MENU_SETTINGS_INPUT_DESC_BEGIN && type <= MENU_SETTINGS_INPUT_DESC_END) - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_input_desc; else if (type >= MENU_SETTINGS_CHEAT_BEGIN && type <= MENU_SETTINGS_CHEAT_END) - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_cheat; else if (type >= MENU_SETTINGS_PERF_COUNTERS_BEGIN && type <= MENU_SETTINGS_PERF_COUNTERS_END) - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_perf_counters; else if (type >= MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_BEGIN && type <= MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_END) - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_libretro_perf_counters; else if (type >= MENU_SETTINGS_SHADER_PRESET_PARAMETER_0 && type <= MENU_SETTINGS_SHADER_PRESET_PARAMETER_LAST) - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_shader_preset_parameter; else if (type >= MENU_SETTINGS_SHADER_PARAMETER_0 && type <= MENU_SETTINGS_SHADER_PARAMETER_LAST) - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_shader_parameter; else { switch (type) { case MENU_FILE_CORE: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_file_core; break; case MENU_FILE_PLAIN: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_file_plain; break; case MENU_FILE_IMAGE: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_file_image; break; case MENU_FILE_USE_DIRECTORY: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_file_use_directory; break; case MENU_FILE_DIRECTORY: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_file_directory; break; case MENU_FILE_CARCHIVE: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_file_carchive; break; case MENU_FILE_OVERLAY: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_file_overlay; break; case MENU_FILE_FONT: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_file_font; break; case MENU_FILE_SHADER: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_file_shader; break; case MENU_FILE_SHADER_PRESET: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_file_shader_preset; break; case MENU_FILE_CONFIG: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_file_config; break; case MENU_FILE_IN_CARCHIVE: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_file_in_carchive; break; case MENU_FILE_VIDEOFILTER: case MENU_FILE_AUDIOFILTER: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_file_filter; break; case MENU_FILE_DOWNLOAD_CORE: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_file_url; break; case MENU_FILE_RDB: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_file_rdb; break; case MENU_FILE_CURSOR: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_file_cursor; break; case MENU_FILE_CHEAT: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_file_cheat; break; case MENU_SETTING_SUBGROUP: case MENU_SETTINGS_CUSTOM_VIEWPORT: case MENU_SETTINGS_CUSTOM_BIND_ALL: case MENU_SETTINGS_CUSTOM_BIND_DEFAULT_ALL: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_more; break; case MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_INDEX: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_disk_index; break; case MENU_SETTINGS_VIDEO_RESOLUTION: - cbs->action_get_representation = + cbs->action_get_value = menu_action_setting_disp_set_label_menu_video_resolution; break; default: - cbs->action_get_representation = menu_action_setting_disp_set_label; + cbs->action_get_value = menu_action_setting_disp_set_label; break; } } diff --git a/menu/menu_entry.c b/menu/menu_entry.c index 8792d62590..bd4b1b0ae7 100644 --- a/menu/menu_entry.c +++ b/menu/menu_entry.c @@ -419,8 +419,8 @@ void menu_entry_get(menu_entry_t *entry, size_t i, cbs = menu_list_get_actiondata_at_offset(list, i); - if (cbs && cbs->action_get_representation && use_representation) - cbs->action_get_representation(list, + if (cbs && cbs->action_get_value && use_representation) + cbs->action_get_value(list, &entry->spacing, entry->type, i, label, entry->value, sizeof(entry->value), entry_label, path, diff --git a/menu/menu_list.h b/menu/menu_list.h index 304a38cfb4..6563fc01fc 100644 --- a/menu/menu_list.h +++ b/menu/menu_list.h @@ -61,7 +61,7 @@ typedef struct menu_file_list_cbs int (*action_refresh)(file_list_t *list, file_list_t *menu_list); int (*action_up)(unsigned type, const char *label); int (*action_down)(unsigned type, const char *label); - void (*action_get_representation)(file_list_t* list, + void (*action_get_value)(file_list_t* list, unsigned *w, unsigned type, unsigned i, const char *label, char *s, size_t len, const char *entry_label,