mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 16:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
twinaphex 2018-02-07 22:59:34 +01:00
parent aa0f553a25
commit 1ca2a617f9
3 changed files with 25 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
menu/cbs/menu_cbs_title.c
View File

@ -798,6 +798,26 @@ static struct cbs_title_lbl_callback cbs_title_lbl_list[] = {
MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_EDGE_MAGAZINE_ISSUE,
action_get_title_list_rdb_entry_edge_magazine_issue
},
{
MENU_ENUM_LABEL_DEFERRED_RDB_ENTRY_DETAIL,
action_get_title_list_rdb_entry_database_info
},
{
MENU_ENUM_LABEL_DATABASE_MANAGER_LIST,
action_get_database_manager_list
},
{
MENU_ENUM_LABEL_LOAD_CONTENT_SPECIAL,
action_get_load_content_special
},
{
MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST,
action_get_title_collection
},
{
MENU_ENUM_LABEL_REMAP_FILE_LOAD,
action_get_title_remap_file_load
},
{
MENU_ENUM_LABEL_CURSOR_MANAGER_LIST,
action_get_cursor_manager_list
@ -805,7 +825,7 @@ static struct cbs_title_lbl_callback cbs_title_lbl_list[] = {
};
static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
const char *label, uint32_t label_hash)
const char *label)
{
unsigned k;
@ -1131,29 +1151,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
return -1;
}
}
else
{
switch (label_hash)
{
case MENU_LABEL_DEFERRED_RDB_ENTRY_DETAIL:
BIND_ACTION_GET_TITLE(cbs, action_get_title_list_rdb_entry_database_info);
break;
case MENU_LABEL_DATABASE_MANAGER_LIST:
BIND_ACTION_GET_TITLE(cbs, action_get_database_manager_list);
break;
case MENU_ENUM_LABEL_LOAD_CONTENT_SPECIAL:
BIND_ACTION_GET_TITLE(cbs, action_get_load_content_special);
break;
case MENU_LABEL_CONTENT_COLLECTION_LIST:
BIND_ACTION_GET_TITLE(cbs, action_get_title_collection);
break;
case MENU_LABEL_REMAP_FILE_LOAD:
BIND_ACTION_GET_TITLE(cbs, action_get_title_remap_file_load);
break;
default:
return -1;
}
}
return 0;
}
@ -1181,8 +1178,7 @@ static int menu_cbs_init_bind_title_compare_type(menu_file_list_cbs_t *cbs,
}
int menu_cbs_init_bind_title(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;
@ -1190,7 +1186,7 @@ int menu_cbs_init_bind_title(menu_file_list_cbs_t *cbs,
BIND_ACTION_GET_TITLE(cbs, action_get_title_default);
if (cbs->enum_idx != MENU_ENUM_LABEL_PLAYLIST_ENTRY &&
menu_cbs_init_bind_title_compare_label(cbs, label, label_hash) == 0)
menu_cbs_init_bind_title_compare_label(cbs, label) == 0)
return 0;
if (menu_cbs_init_bind_title_compare_type(cbs, type) == 0)

2
menu/menu_cbs.c
View File

@ -320,7 +320,7 @@ void menu_cbs_init(void *data,
/* It will try to find a corresponding callback function inside
* menu_cbs_title.c, then map this callback to the entry. */
menu_cbs_init_bind_title(cbs, path, label, type, idx, label_hash);
menu_cbs_init_bind_title(cbs, path, label, type, idx);
menu_cbs_init_log(repr_label, "GET TITLE", cbs->action_get_title_ident);

3
menu/menu_cbs.h
View File

@ -227,8 +227,7 @@ int menu_cbs_init_bind_scan(menu_file_list_cbs_t *cbs,
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,
uint32_t label_hash);
const char *path, const char *label, unsigned type, size_t idx);
#ifdef HAVE_LIBRETRODB
int action_scan_directory(const char *path,