diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index cd45aa4594..2445acda2b 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -1088,8 +1088,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label( } static int menu_cbs_init_bind_deferred_push_compare_type( - menu_file_list_cbs_t *cbs, unsigned type, - uint32_t label_hash) + menu_file_list_cbs_t *cbs, unsigned type) { if (type == MENU_SETTING_GROUP) { @@ -1111,7 +1110,6 @@ static int menu_cbs_init_bind_deferred_push_compare_type( int menu_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - const char *elem0, const char *elem1, uint32_t label_hash, uint32_t menu_label_hash) { if (!cbs) @@ -1124,7 +1122,7 @@ int menu_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs, return 0; if (menu_cbs_init_bind_deferred_push_compare_type( - cbs, type, label_hash) == 0) + cbs, type) == 0) return 0; return -1; diff --git a/menu/cbs/menu_cbs_down.c b/menu/cbs/menu_cbs_down.c index d6a9317c92..d18cd37ade 100644 --- a/menu/cbs/menu_cbs_down.c +++ b/menu/cbs/menu_cbs_down.c @@ -42,7 +42,6 @@ static int action_bind_down_generic(unsigned type, const char *label) int menu_cbs_init_bind_down(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - const char *elem0, const char *elem1, uint32_t label_hash, uint32_t menu_label_hash) { if (!cbs) diff --git a/menu/cbs/menu_cbs_up.c b/menu/cbs/menu_cbs_up.c index f9f84168d4..582d076f25 100644 --- a/menu/cbs/menu_cbs_up.c +++ b/menu/cbs/menu_cbs_up.c @@ -42,7 +42,6 @@ static int action_bind_up_generic(unsigned type, const char *label) int menu_cbs_init_bind_up(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - const char *elem0, const char *elem1, uint32_t label_hash, uint32_t menu_label_hash) { if (!cbs) diff --git a/menu/menu_cbs.c b/menu/menu_cbs.c index 45e94b5cbd..6cf6d30a1a 100644 --- a/menu/menu_cbs.c +++ b/menu/menu_cbs.c @@ -109,11 +109,11 @@ void menu_cbs_init(void *data, menu_cbs_init_log(repr_label, "CONTENT SWITCH", cbs->action_content_list_switch_ident); - menu_cbs_init_bind_up(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); + menu_cbs_init_bind_up(cbs, path, label, type, idx, label_hash, menu_label_hash); menu_cbs_init_log(repr_label, "UP", cbs->action_up_ident); - menu_cbs_init_bind_down(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); + menu_cbs_init_bind_down(cbs, path, label, type, idx, label_hash, menu_label_hash); menu_cbs_init_log(repr_label, "DOWN", cbs->action_down_ident); @@ -125,7 +125,7 @@ void menu_cbs_init(void *data, menu_cbs_init_log(repr_label, "RIGHT", cbs->action_right_ident); - menu_cbs_init_bind_deferred_push(cbs, path, label, type, idx, elem0, elem1, label_hash, menu_label_hash); + menu_cbs_init_bind_deferred_push(cbs, path, label, type, idx, label_hash, menu_label_hash); menu_cbs_init_log(repr_label, "DEFERRED PUSH", cbs->action_deferred_push_ident); diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h index 4f74b6be03..b9b3f25f38 100644 --- a/menu/menu_cbs.h +++ b/menu/menu_cbs.h @@ -134,12 +134,10 @@ int menu_cbs_init_bind_get_string_representation(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_up(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - const char *elem0, const char *elem1, uint32_t label_hash, uint32_t menu_label_hash); int menu_cbs_init_bind_down(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - const char *elem0, const char *elem1, uint32_t label_hash, uint32_t menu_label_hash); int menu_cbs_init_bind_info(menu_file_list_cbs_t *cbs, @@ -165,7 +163,6 @@ int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs, int menu_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx, - const char *elem0, const char *elem1, uint32_t label_hash, uint32_t menu_label_hash); int menu_cbs_init_bind_select(menu_file_list_cbs_t *cbs,