This commit is contained in:
twinaphex 2016-07-01 20:59:51 +02:00
parent 9596c7b3c4
commit fe70f766f1
3 changed files with 5 additions and 10 deletions

View File

@ -3074,8 +3074,7 @@ static int deferred_push_content_actions(menu_displaylist_info_t *info)
return 0; return 0;
} }
static int xmb_list_bind_init_compare_label(menu_file_list_cbs_t *cbs, static int xmb_list_bind_init_compare_label(menu_file_list_cbs_t *cbs)
uint32_t label_hash)
{ {
if (cbs && cbs->enum_idx != MSG_UNKNOWN) if (cbs && cbs->enum_idx != MSG_UNKNOWN)
{ {
@ -3093,10 +3092,9 @@ static int xmb_list_bind_init_compare_label(menu_file_list_cbs_t *cbs,
} }
static int xmb_list_bind_init(menu_file_list_cbs_t *cbs, static int xmb_list_bind_init(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx, const char *path, const char *label, unsigned type, size_t idx)
uint32_t label_hash, uint32_t menu_label_hash)
{ {
if (xmb_list_bind_init_compare_label(cbs, label_hash) == 0) if (xmb_list_bind_init_compare_label(cbs) == 0)
return 0; return 0;
return -1; return -1;

View File

@ -885,9 +885,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
bind->path, bind->path,
bind->label, bind->label,
bind->type, bind->type,
bind->idx, bind->idx);
bind->label_hash,
bind->menu_label_hash);
} }
break; break;
case RARCH_MENU_CTL_UPDATE_THUMBNAIL_PATH: case RARCH_MENU_CTL_UPDATE_THUMBNAIL_PATH:

View File

@ -289,8 +289,7 @@ typedef struct menu_ctx_driver
void *(*list_get_entry)(void *data, enum menu_list_type type, unsigned i); void *(*list_get_entry)(void *data, enum menu_list_type type, unsigned i);
void (*list_set_selection)(void *data, file_list_t *list); void (*list_set_selection)(void *data, file_list_t *list);
int (*bind_init)(menu_file_list_cbs_t *cbs, int (*bind_init)(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx, const char *path, const char *label, unsigned type, size_t idx);
uint32_t label_hash, uint32_t menu_label_hash);
bool (*load_image)(void *userdata, void *data, enum menu_image_type type); bool (*load_image)(void *userdata, void *data, enum menu_image_type type);
const char *ident; const char *ident;
int (*environ_cb)(enum menu_environ_cb type, void *data, void *userdata); int (*environ_cb)(enum menu_environ_cb type, void *data, void *userdata);