libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-17 16:10:29 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Get rid of more hashes

Browse Source
This commit is contained in:
twinaphex 2020-02-23 09:22:30 +01:00
parent 65d2c53bfe
commit 19f9ffc99f
4 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
menu/cbs/menu_cbs_deferred_push.c
View File

@ -1182,25 +1182,29 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
return -1;
}
}
else if (string_is_equal(label, "settings"))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_settings);
}
else if (string_is_equal(label, "configurations_list"))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations_list);
}
else if (string_is_equal(label, "deferred_playlist_manager_list"))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_playlist_manager_list);
}
else if (string_is_equal(label, "deferred_playlist_manager_settings"))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_playlist_manager_settings);
}
else
{
switch (label_hash)
{
case MENU_LABEL_SETTINGS: /* TODO/FIXME */
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_settings);
break;
case MENU_LABEL_DEFERRED_CONFIGURATIONS_LIST: /* TODO/FIXME */
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_configurations_list);
break;
case MENU_LABEL_DEFERRED_PLAYLIST_SETTINGS_LIST:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_playlist_settings_list);
break;
case MENU_LABEL_DEFERRED_PLAYLIST_MANAGER_LIST:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_playlist_manager_list);
break;
case MENU_LABEL_DEFERRED_PLAYLIST_MANAGER_SETTINGS:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_playlist_manager_settings);
break;
case MENU_LABEL_DEFERRED_ACCOUNTS_CHEEVOS_LIST:
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_accounts_cheevos_list);
break;

17
menu/cbs/menu_cbs_ok.c
View File

@ -7476,7 +7476,10 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
}
static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
uint32_t label_hash, uint32_t menu_label_hash, unsigned type)
const char *label,
uint32_t label_hash,
const char *menu_label,
uint32_t menu_label_hash, unsigned type)
{
if (type == MENU_SET_CDROM_LIST)
{
@ -7618,7 +7621,7 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
{
BIND_ACTION_OK(cbs, action_ok_playlist_entry_collection);
}
else if (label_hash == MENU_LABEL_RDB_ENTRY_START_CONTENT)
else if (string_is_equal(label, "rdb_entry_start_content"))
{
BIND_ACTION_OK(cbs, action_ok_playlist_entry_start_content);
}
@ -7650,7 +7653,7 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
BIND_ACTION_OK(cbs, action_ok_push_generic_list);
break;
case FILE_TYPE_CHEAT:
if (menu_label_hash == MENU_LABEL_CHEAT_FILE_LOAD_APPEND)
if (string_is_equal(menu_label, "cheat_file_load_append"))
{
BIND_ACTION_OK(cbs, action_ok_cheat_file_load_append);
}
@ -7950,7 +7953,9 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
uint32_t label_hash, uint32_t menu_label_hash)
uint32_t label_hash,
const char *menu_label,
uint32_t menu_label_hash)
{
if (!cbs)
return -1;
@ -7960,7 +7965,9 @@ int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
if (menu_cbs_init_bind_ok_compare_label(cbs, label, label_hash) == 0)
return 0;
if (menu_cbs_init_bind_ok_compare_type(cbs, label_hash, menu_label_hash, type) == 0)
if (menu_cbs_init_bind_ok_compare_type(cbs, label,
label_hash, menu_label,
menu_label_hash, type) == 0)
return 0;
return -1;

3
menu/menu_cbs.c
View File

@ -238,7 +238,8 @@ void menu_cbs_init(void *data,
/* It will try to find a corresponding callback function inside
* menu_cbs_ok.c, then map this callback to the entry. */
menu_cbs_init_bind_ok(cbs, path, label, type, idx, label_hash, menu_label_hash);
menu_cbs_init_bind_ok(cbs, path, label, type, idx, label_hash, menu_label,
menu_label_hash);
menu_cbs_init_log(repr_label, "OK", cbs->action_ok_ident);

4
menu/menu_cbs.h
View File

@ -277,7 +277,9 @@ int menu_cbs_init_bind_cancel(menu_file_list_cbs_t *cbs,
int menu_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,
uint32_t label_hash, uint32_t menu_label_hash);
uint32_t label_hash,
const char *menu_label,
uint32_t menu_label_hash);
int menu_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs,
const char *path, const char *label, unsigned type, size_t idx,