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

Rename menu_entries_cbs_representation.c to menu_entries_cbs_get_value.c

Browse Source
This commit is contained in:
twinaphex 2015-06-08 14:30:05 +02:00
parent 263fc0d4af
commit 01d07721b4
5 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -350,7 +350,7 @@ ifeq ($(HAVE_MENU_COMMON), 1)
menu/menu_entries_cbs_right.o \ menu/menu_entries_cbs_right.o \
menu/menu_entries_cbs_deferred_push.o \ menu/menu_entries_cbs_deferred_push.o \
menu/menu_entries_cbs_scan.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_iterate.o \
menu/menu_entries_cbs_title.o \ menu/menu_entries_cbs_title.o \
menu/menu_entries_cbs_up.o \ menu/menu_entries_cbs_up.o \

2
griffin/griffin.c
View File

@ -726,7 +726,7 @@ MENU
#include "../menu/menu_entries_cbs_title.c" #include "../menu/menu_entries_cbs_title.c"
#include "../menu/menu_entries_cbs_deferred_push.c" #include "../menu/menu_entries_cbs_deferred_push.c"
#include "../menu/menu_entries_cbs_scan.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_iterate.c"
#include "../menu/menu_entries_cbs_up.c" #include "../menu/menu_entries_cbs_up.c"
#include "../menu/menu_entries_cbs_down.c" #include "../menu/menu_entries_cbs_down.c"

72
menu/menu_entries_cbs_representation.c → menu/menu_entries_cbs_get_value.c
View File

@ -796,39 +796,39 @@ static int menu_entries_cbs_init_bind_get_string_representation_compare_label(
switch (label_hash) switch (label_hash)
{ {
case MENU_LABEL_CHEAT_NUM_PASSES: case MENU_LABEL_CHEAT_NUM_PASSES:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_cheat_num_passes; menu_action_setting_disp_set_label_cheat_num_passes;
break; break;
case MENU_LABEL_REMAP_FILE_LOAD: case MENU_LABEL_REMAP_FILE_LOAD:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_remap_file_load; menu_action_setting_disp_set_label_remap_file_load;
break; break;
case MENU_LABEL_VIDEO_SHADER_FILTER_PASS: case MENU_LABEL_VIDEO_SHADER_FILTER_PASS:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_shader_filter_pass; menu_action_setting_disp_set_label_shader_filter_pass;
break; break;
case MENU_LABEL_VIDEO_SHADER_SCALE_PASS: case MENU_LABEL_VIDEO_SHADER_SCALE_PASS:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_shader_scale_pass; menu_action_setting_disp_set_label_shader_scale_pass;
break; break;
case MENU_LABEL_VIDEO_SHADER_NUM_PASSES: case MENU_LABEL_VIDEO_SHADER_NUM_PASSES:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_shader_num_passes; menu_action_setting_disp_set_label_shader_num_passes;
break; break;
case MENU_LABEL_VIDEO_SHADER_PASS: case MENU_LABEL_VIDEO_SHADER_PASS:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_shader_pass; menu_action_setting_disp_set_label_shader_pass;
break; break;
case MENU_LABEL_VIDEO_SHADER_DEFAULT_FILTER: case MENU_LABEL_VIDEO_SHADER_DEFAULT_FILTER:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_shader_default_filter; menu_action_setting_disp_set_label_shader_default_filter;
break; break;
case MENU_LABEL_VIDEO_FILTER: case MENU_LABEL_VIDEO_FILTER:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_filter; menu_action_setting_disp_set_label_filter;
break; break;
case MENU_LABEL_CONFIGURATIONS: case MENU_LABEL_CONFIGURATIONS:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_configurations; menu_action_setting_disp_set_label_configurations;
break; break;
default: default:
@ -843,118 +843,118 @@ static int menu_entries_cbs_init_bind_get_string_representation_compare_type(
{ {
if (type >= MENU_SETTINGS_INPUT_DESC_BEGIN if (type >= MENU_SETTINGS_INPUT_DESC_BEGIN
&& type <= MENU_SETTINGS_INPUT_DESC_END) && type <= MENU_SETTINGS_INPUT_DESC_END)
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_input_desc; menu_action_setting_disp_set_label_input_desc;
else if (type >= MENU_SETTINGS_CHEAT_BEGIN else if (type >= MENU_SETTINGS_CHEAT_BEGIN
&& type <= MENU_SETTINGS_CHEAT_END) && type <= MENU_SETTINGS_CHEAT_END)
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_cheat; menu_action_setting_disp_set_label_cheat;
else if (type >= MENU_SETTINGS_PERF_COUNTERS_BEGIN else if (type >= MENU_SETTINGS_PERF_COUNTERS_BEGIN
&& type <= MENU_SETTINGS_PERF_COUNTERS_END) && type <= MENU_SETTINGS_PERF_COUNTERS_END)
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_perf_counters; menu_action_setting_disp_set_label_perf_counters;
else if (type >= MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_BEGIN else if (type >= MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_BEGIN
&& type <= MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_END) && type <= MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_END)
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_libretro_perf_counters; menu_action_setting_disp_set_label_libretro_perf_counters;
else if (type >= MENU_SETTINGS_SHADER_PRESET_PARAMETER_0 else if (type >= MENU_SETTINGS_SHADER_PRESET_PARAMETER_0
&& type <= MENU_SETTINGS_SHADER_PRESET_PARAMETER_LAST) && type <= MENU_SETTINGS_SHADER_PRESET_PARAMETER_LAST)
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_shader_preset_parameter; menu_action_setting_disp_set_label_shader_preset_parameter;
else if (type >= MENU_SETTINGS_SHADER_PARAMETER_0 else if (type >= MENU_SETTINGS_SHADER_PARAMETER_0
&& type <= MENU_SETTINGS_SHADER_PARAMETER_LAST) && type <= MENU_SETTINGS_SHADER_PARAMETER_LAST)
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_shader_parameter; menu_action_setting_disp_set_label_shader_parameter;
else else
{ {
switch (type) switch (type)
{ {
case MENU_FILE_CORE: case MENU_FILE_CORE:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_file_core; menu_action_setting_disp_set_label_menu_file_core;
break; break;
case MENU_FILE_PLAIN: case MENU_FILE_PLAIN:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_file_plain; menu_action_setting_disp_set_label_menu_file_plain;
break; break;
case MENU_FILE_IMAGE: case MENU_FILE_IMAGE:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_file_image; menu_action_setting_disp_set_label_menu_file_image;
break; break;
case MENU_FILE_USE_DIRECTORY: case MENU_FILE_USE_DIRECTORY:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_file_use_directory; menu_action_setting_disp_set_label_menu_file_use_directory;
break; break;
case MENU_FILE_DIRECTORY: case MENU_FILE_DIRECTORY:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_file_directory; menu_action_setting_disp_set_label_menu_file_directory;
break; break;
case MENU_FILE_CARCHIVE: case MENU_FILE_CARCHIVE:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_file_carchive; menu_action_setting_disp_set_label_menu_file_carchive;
break; break;
case MENU_FILE_OVERLAY: case MENU_FILE_OVERLAY:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_file_overlay; menu_action_setting_disp_set_label_menu_file_overlay;
break; break;
case MENU_FILE_FONT: case MENU_FILE_FONT:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_file_font; menu_action_setting_disp_set_label_menu_file_font;
break; break;
case MENU_FILE_SHADER: case MENU_FILE_SHADER:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_file_shader; menu_action_setting_disp_set_label_menu_file_shader;
break; break;
case MENU_FILE_SHADER_PRESET: case MENU_FILE_SHADER_PRESET:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_file_shader_preset; menu_action_setting_disp_set_label_menu_file_shader_preset;
break; break;
case MENU_FILE_CONFIG: case MENU_FILE_CONFIG:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_file_config; menu_action_setting_disp_set_label_menu_file_config;
break; break;
case MENU_FILE_IN_CARCHIVE: case MENU_FILE_IN_CARCHIVE:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_file_in_carchive; menu_action_setting_disp_set_label_menu_file_in_carchive;
break; break;
case MENU_FILE_VIDEOFILTER: case MENU_FILE_VIDEOFILTER:
case MENU_FILE_AUDIOFILTER: case MENU_FILE_AUDIOFILTER:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_file_filter; menu_action_setting_disp_set_label_menu_file_filter;
break; break;
case MENU_FILE_DOWNLOAD_CORE: case MENU_FILE_DOWNLOAD_CORE:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_file_url; menu_action_setting_disp_set_label_menu_file_url;
break; break;
case MENU_FILE_RDB: case MENU_FILE_RDB:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_file_rdb; menu_action_setting_disp_set_label_menu_file_rdb;
break; break;
case MENU_FILE_CURSOR: case MENU_FILE_CURSOR:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_file_cursor; menu_action_setting_disp_set_label_menu_file_cursor;
break; break;
case MENU_FILE_CHEAT: case MENU_FILE_CHEAT:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_file_cheat; menu_action_setting_disp_set_label_menu_file_cheat;
break; break;
case MENU_SETTING_SUBGROUP: case MENU_SETTING_SUBGROUP:
case MENU_SETTINGS_CUSTOM_VIEWPORT: case MENU_SETTINGS_CUSTOM_VIEWPORT:
case MENU_SETTINGS_CUSTOM_BIND_ALL: case MENU_SETTINGS_CUSTOM_BIND_ALL:
case MENU_SETTINGS_CUSTOM_BIND_DEFAULT_ALL: case MENU_SETTINGS_CUSTOM_BIND_DEFAULT_ALL:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_more; menu_action_setting_disp_set_label_menu_more;
break; break;
case MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_INDEX: 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; menu_action_setting_disp_set_label_menu_disk_index;
break; break;
case MENU_SETTINGS_VIDEO_RESOLUTION: case MENU_SETTINGS_VIDEO_RESOLUTION:
cbs->action_get_representation = cbs->action_get_value =
menu_action_setting_disp_set_label_menu_video_resolution; menu_action_setting_disp_set_label_menu_video_resolution;
break; break;
default: default:
cbs->action_get_representation = menu_action_setting_disp_set_label; cbs->action_get_value = menu_action_setting_disp_set_label;
break; break;
} }
} }

4
menu/menu_entry.c
View File

@ -419,8 +419,8 @@ void menu_entry_get(menu_entry_t *entry, size_t i,
cbs = menu_list_get_actiondata_at_offset(list, i); cbs = menu_list_get_actiondata_at_offset(list, i);
if (cbs && cbs->action_get_representation && use_representation) if (cbs && cbs->action_get_value && use_representation)
cbs->action_get_representation(list, cbs->action_get_value(list,
&entry->spacing, entry->type, i, label, &entry->spacing, entry->type, i, label,
entry->value, sizeof(entry->value), entry->value, sizeof(entry->value),
entry_label, path, entry_label, path,

2
menu/menu_list.h
View File

@ -61,7 +61,7 @@ typedef struct menu_file_list_cbs
int (*action_refresh)(file_list_t *list, file_list_t *menu_list); int (*action_refresh)(file_list_t *list, file_list_t *menu_list);
int (*action_up)(unsigned type, const char *label); int (*action_up)(unsigned type, const char *label);
int (*action_down)(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, unsigned *w, unsigned type, unsigned i,
const char *label, char *s, size_t len, const char *label, char *s, size_t len,
const char *entry_label, const char *entry_label,