From e6bf3227370a8235c3facb5318603f7c6787516e Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 6 Feb 2018 21:38:25 +0100 Subject: [PATCH] Remove hashes --- menu/cbs/menu_cbs_deferred_push.c | 14 ++++++++------ menu/cbs/menu_cbs_title.c | 21 ++++++++++++--------- msg_hash.h | 3 --- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index f92dbb0593..a14c6ce58a 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -818,6 +818,14 @@ static struct cbs_deferred_lbl_callback cbs_deferred_lbl_list[] = { { MENU_ENUM_LABEL_ACHIEVEMENT_LIST, deferred_push_achievement_list + }, + { + MENU_ENUM_LABEL_DEFERRED_RECORDING_SETTINGS_LIST, + deferred_push_recording_settings_list + }, + { + MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_CHEEVOS_LIST, + deferred_push_accounts_cheevos_list } }; @@ -1244,12 +1252,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label( { switch (label_hash) { - case MENU_LABEL_DEFERRED_RECORDING_SETTINGS_LIST: - BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_recording_settings_list); - break; - case MENU_LABEL_DEFERRED_ACCOUNTS_CHEEVOS_LIST: - BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_accounts_cheevos_list); - break; case MENU_LABEL_DEFERRED_ARCHIVE_ACTION_DETECT_CORE: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_archive_action_detect_core); break; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index f255b7f438..441c021fbe 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -709,6 +709,18 @@ static struct cbs_title_lbl_callback cbs_title_lbl_list[] = { { MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_LIST, action_get_download_core_content_list + }, + { + MENU_ENUM_LABEL_DEFERRED_RECORDING_SETTINGS_LIST, + action_get_recording_settings_list + }, + { + MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_CHEEVOS_LIST, + action_get_user_accounts_cheevos_list + }, + { + MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_LIST, + action_get_user_accounts_list } }; @@ -1112,21 +1124,12 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_LABEL_CORE_COUNTERS: BIND_ACTION_GET_TITLE(cbs, action_get_core_counters_list); break; - case MENU_LABEL_DEFERRED_RECORDING_SETTINGS_LIST: - BIND_ACTION_GET_TITLE(cbs, action_get_recording_settings_list); - 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; - case MENU_LABEL_DEFERRED_ACCOUNTS_CHEEVOS_LIST: - BIND_ACTION_GET_TITLE(cbs, action_get_user_accounts_cheevos_list); - break; - case MENU_LABEL_DEFERRED_ACCOUNTS_LIST: - BIND_ACTION_GET_TITLE(cbs, action_get_user_accounts_list); - break; default: return -1; } diff --git a/msg_hash.h b/msg_hash.h index d7984fcba6..f9eb5e2539 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1762,9 +1762,6 @@ enum msg_hash_enums #define MENU_LABEL_DEFERRED_RDB_ENTRY_DETAIL 0xc35416c0U #define MENU_LABEL_DEFERRED_RPL_ENTRY_ACTIONS 0x358a7494U #define MENU_LABEL_DEFERRED_CORE_LIST 0xf157d289U -#define MENU_LABEL_DEFERRED_RECORDING_SETTINGS_LIST 0x05548d52U -#define MENU_LABEL_DEFERRED_ACCOUNTS_CHEEVOS_LIST 0x1322324cU -#define MENU_LABEL_DEFERRED_ACCOUNTS_LIST 0x3d2b8860U #define MENU_LABEL_DEFERRED_ARCHIVE_ACTION_DETECT_CORE 0xdc9c0064U #define MENU_LABEL_DEFERRED_ARCHIVE_ACTION 0x7faf0284U #define MENU_LABEL_DEFERRED_ARCHIVE_OPEN_DETECT_CORE 0xd9452498U