(menu_cbs_get_value.c) Get rid of label_hash

This commit is contained in:
twinaphex 2016-07-10 13:47:19 +02:00
parent c53bb5c7be
commit eb37e95cca
3 changed files with 6 additions and 16 deletions

View File

@ -1425,7 +1425,7 @@ static void menu_action_setting_disp_set_label(file_list_t* list,
}
static int menu_cbs_init_bind_get_string_representation_compare_label(
menu_file_list_cbs_t *cbs, uint32_t label_hash)
menu_file_list_cbs_t *cbs)
{
if (cbs->enum_idx != MSG_UNKNOWN)
{
@ -1543,15 +1543,7 @@ static int menu_cbs_init_bind_get_string_representation_compare_label(
}
else
{
switch (label_hash)
{
case MENU_LABEL_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_input_keyboard_gamepad_mapping_type);
break;
default:
return - 1;
}
return -1;
}
return 0;
@ -1697,8 +1689,7 @@ static int menu_cbs_init_bind_get_string_representation_compare_type(
}
int menu_cbs_init_bind_get_string_representation(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
uint32_t label_hash)
const char *path, const char *label, unsigned type, size_t idx)
{
if (!cbs)
return -1;
@ -1764,7 +1755,7 @@ int menu_cbs_init_bind_get_string_representation(menu_file_list_cbs_t *cbs,
return 0;
}
if (menu_cbs_init_bind_get_string_representation_compare_label(cbs, label_hash) == 0)
if (menu_cbs_init_bind_get_string_representation_compare_label(cbs) == 0)
return 0;
if (menu_cbs_init_bind_get_string_representation_compare_type(cbs, type) == 0)

View File

@ -118,7 +118,7 @@ void menu_cbs_init(void *data,
menu_cbs_init_log(repr_label, "REFRESH", cbs->action_refresh_ident);
menu_cbs_init_bind_get_string_representation(cbs, path, label, type, idx, label_hash);
menu_cbs_init_bind_get_string_representation(cbs, path, label, type, idx);
menu_cbs_init_log(repr_label, "GET VALUE", cbs->action_get_value_ident);

View File

@ -146,8 +146,7 @@ int menu_cbs_init_bind_refresh(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx);
int menu_cbs_init_bind_get_string_representation(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
uint32_t label_hash);
const char *path, const char *label, unsigned type, size_t idx);
int menu_cbs_init_bind_label(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx);