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

Move get representation implementation to menu_setting.c

Browse Source
This commit is contained in:
twinaphex 2018-09-23 11:34:30 +02:00
parent 242a7eb914
commit 6c3610decc
2 changed files with 29 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
menu/cbs/menu_cbs_get_value.c
View File

@ -1268,43 +1268,6 @@ static void menu_action_setting_disp_set_label_left_thumbnails(
} }
} }
static void menu_action_setting_disp_set_label_menu_toggle_gamepad_combo(
file_list_t* list,
unsigned *w, unsigned type, unsigned i,
const char *label,
char *s, size_t len,
const char *entry_label,
const char *path,
char *s2, size_t len2)
{
settings_t *settings = config_get_ptr();
if (!settings)
return;
strlcpy(s2, path, len2);
*w = 19;
switch (settings->uints.input_menu_toggle_gamepad_combo)
{
case INPUT_TOGGLE_NONE:
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NONE), len);
break;
case INPUT_TOGGLE_DOWN_Y_L_R:
strlcpy(s, "Down + L1 + R1 + Y", len);
break;
case INPUT_TOGGLE_L3_R3:
strlcpy(s, "L3 + R3", len);
break;
case INPUT_TOGGLE_L1_R1_START_SELECT:
strlcpy(s, "L1 + R1 + Start + Select", len);
break;
case INPUT_TOGGLE_START_SELECT:
strlcpy(s, "Start + Select", len);
break;
}
}
static void menu_action_setting_disp_set_label_menu_disk_index( static void menu_action_setting_disp_set_label_menu_disk_index(
file_list_t* list, file_list_t* list,
@ -2056,10 +2019,6 @@ static int menu_cbs_init_bind_get_string_representation_compare_label(
BIND_ACTION_GET_VALUE(cbs, BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_left_thumbnails); menu_action_setting_disp_set_label_left_thumbnails);
break; break;
case MENU_ENUM_LABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_toggle_gamepad_combo);
break;
case MENU_ENUM_LABEL_CHEAT_NUM_PASSES: case MENU_ENUM_LABEL_CHEAT_NUM_PASSES:
BIND_ACTION_GET_VALUE(cbs, BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_cheat_num_passes); menu_action_setting_disp_set_label_cheat_num_passes);

29
menu/menu_setting.c
View File

@ -766,6 +766,33 @@ static void setting_get_string_representation_netplay_mitm_server(void *data,
} }
#endif #endif
static void setting_get_string_representation_toggle_gamepad_combo(void *data,
char *s, size_t len)
{
rarch_setting_t *setting = (rarch_setting_t*)data;
if (!setting)
return;
switch (*setting->value.target.unsigned_integer)
{
case INPUT_TOGGLE_NONE:
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NONE), len);
break;
case INPUT_TOGGLE_DOWN_Y_L_R:
strlcpy(s, "Down + L1 + R1 + Y", len);
break;
case INPUT_TOGGLE_L3_R3:
strlcpy(s, "L3 + R3", len);
break;
case INPUT_TOGGLE_L1_R1_START_SELECT:
strlcpy(s, "L1 + R1 + Start + Select", len);
break;
case INPUT_TOGGLE_START_SELECT:
strlcpy(s, "Start + Select", len);
break;
}
}
#ifdef HAVE_LANGEXTRA #ifdef HAVE_LANGEXTRA
static void setting_get_string_representation_uint_user_language(void *data, static void setting_get_string_representation_uint_user_language(void *data,
char *s, size_t len) char *s, size_t len)
@ -5180,6 +5207,8 @@ static bool setting_append_list(
parent_group, parent_group,
general_write_handler, general_write_handler,
general_read_handler); general_read_handler);
(*list)[list_info->index - 1].get_string_representation =
&setting_get_string_representation_toggle_gamepad_combo;
menu_settings_list_current_add_range(list, list_info, 0, 4, 1, true, true); menu_settings_list_current_add_range(list, list_info, 0, 4, 1, true, true);
CONFIG_BOOL( CONFIG_BOOL(