From f30f5974997c08b2693efff576a1eba097367268 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 6 Feb 2018 22:04:17 +0100 Subject: [PATCH] Get rid of more hashes --- menu/cbs/menu_cbs_deferred_push.c | 14 ++++++++------ menu/cbs/menu_cbs_title.c | 14 ++++++++------ msg_hash.h | 4 ---- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index 1f3df6359b..cadd27047b 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -836,6 +836,14 @@ static struct cbs_deferred_lbl_callback cbs_deferred_lbl_list[] = { { MENU_ENUM_LABEL_DEFERRED_CORE_LIST, deferred_push_core_list_deferred + }, + { + MENU_ENUM_LABEL_CORE_COUNTERS, + deferred_push_core_counters + }, + { + MENU_ENUM_LABEL_FRONTEND_COUNTERS, + deferred_push_frontend_counters } }; @@ -1348,12 +1356,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label( BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_releaseyear); break; #endif - case MENU_LABEL_CORE_COUNTERS: - BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_counters); - break; - case MENU_LABEL_FRONTEND_COUNTERS: - BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_frontend_counters); - break; case MENU_LABEL_CONTENT_COLLECTION_LIST: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_content_collection_list); break; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index f9c7daebb7..24dd1abae8 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -733,6 +733,14 @@ static struct cbs_title_lbl_callback cbs_title_lbl_list[] = { { MENU_ENUM_LABEL_DEFERRED_DATABASE_MANAGER_LIST, action_get_title_deferred_database_manager_list + }, + { + MENU_ENUM_LABEL_FRONTEND_COUNTERS, + action_get_frontend_counters_list + }, + { + MENU_ENUM_LABEL_CORE_COUNTERS, + action_get_core_counters_list } }; @@ -1121,12 +1129,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_LOAD_CONTENT_SPECIAL: BIND_ACTION_GET_TITLE(cbs, action_get_load_content_special); break; - case MENU_LABEL_FRONTEND_COUNTERS: - BIND_ACTION_GET_TITLE(cbs, action_get_frontend_counters_list); - break; - case MENU_LABEL_CORE_COUNTERS: - BIND_ACTION_GET_TITLE(cbs, action_get_core_counters_list); - break; case MENU_LABEL_CONTENT_COLLECTION_LIST: BIND_ACTION_GET_TITLE(cbs, action_get_title_collection); break; diff --git a/msg_hash.h b/msg_hash.h index 193f4e3510..8d1e8f53d3 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1737,8 +1737,6 @@ enum msg_hash_enums MSG_LAST }; -/* Deferred */ - #define MENU_LABEL_DEFERRED_VIDEO_FILTER 0x966ad201U #define MENU_LABEL_DEFERRED_CORE_LIST_SET 0xa6d5fdb4U #define MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_DEVELOPER 0xcbd89be5U @@ -1766,8 +1764,6 @@ enum msg_hash_enums #define MENU_LABEL_RDB_ENTRY_START_CONTENT 0x95025a55U -#define MENU_LABEL_FRONTEND_COUNTERS 0xe5696877U -#define MENU_LABEL_CORE_COUNTERS 0x64cc83e0U #define MENU_LABEL_DATABASE_MANAGER_LIST 0x7f853d8fU #define MENU_LABEL_CURSOR_MANAGER_LIST 0xa969e378U #define MENU_LABEL_REMAP_FILE_LOAD 0x9c2799b8U