diff --git a/menu/cbs/menu_cbs_scan.c b/menu/cbs/menu_cbs_scan.c index 181717654e..649e6c5098 100644 --- a/menu/cbs/menu_cbs_scan.c +++ b/menu/cbs/menu_cbs_scan.c @@ -134,8 +134,7 @@ static int menu_cbs_init_bind_scan_compare_type(menu_file_list_cbs_t *cbs, } int menu_cbs_init_bind_scan(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; diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c index da6d1b42ab..b096297ad8 100644 --- a/menu/cbs/menu_cbs_select.c +++ b/menu/cbs/menu_cbs_select.c @@ -179,14 +179,13 @@ static int menu_cbs_init_bind_select_compare_type( } static int menu_cbs_init_bind_select_compare_label(menu_file_list_cbs_t *cbs, - const char *label, uint32_t hash) + const char *label) { return -1; } int menu_cbs_init_bind_select(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; @@ -210,7 +209,7 @@ int menu_cbs_init_bind_select(menu_file_list_cbs_t *cbs, return 0; } - if (menu_cbs_init_bind_select_compare_label(cbs, label, label_hash) == 0) + if (menu_cbs_init_bind_select_compare_label(cbs, label) == 0) return 0; if (menu_cbs_init_bind_select_compare_type(cbs, type) == 0) diff --git a/menu/menu_cbs.c b/menu/menu_cbs.c index a142816eeb..03fcb9c3e3 100644 --- a/menu/menu_cbs.c +++ b/menu/menu_cbs.c @@ -74,7 +74,7 @@ void menu_cbs_init(void *data, menu_cbs_init_log(repr_label, "CANCEL", cbs->action_cancel_ident); - menu_cbs_init_bind_scan(cbs, path, label, type, idx, label_hash); + menu_cbs_init_bind_scan(cbs, path, label, type, idx); menu_cbs_init_log(repr_label, "SCAN", cbs->action_scan_ident); @@ -82,7 +82,7 @@ void menu_cbs_init(void *data, menu_cbs_init_log(repr_label, "START", cbs->action_start_ident); - menu_cbs_init_bind_select(cbs, path, label, type, idx, label_hash); + menu_cbs_init_bind_select(cbs, path, label, type, idx); menu_cbs_init_log(repr_label, "SELECT", cbs->action_select_ident); diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h index 8aeadbf75c..16e29c7904 100644 --- a/menu/menu_cbs.h +++ b/menu/menu_cbs.h @@ -159,12 +159,10 @@ int menu_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs, uint32_t label_hash); int menu_cbs_init_bind_select(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_scan(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_title(menu_file_list_cbs_t *cbs, const char *path, const char *label, unsigned type, size_t idx,