diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index b1dc149909..c6dbae7825 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -734,6 +734,18 @@ static struct cbs_deferred_lbl_callback cbs_deferred_lbl_list[] = { { MENU_ENUM_LABEL_NETPLAY, deferred_push_netplay + }, + { + MENU_ENUM_LABEL_VIDEO_FONT_PATH, + deferred_push_video_font_path + }, + { + MENU_ENUM_LABEL_XMB_FONT, + deferred_push_xmb_font_path + }, + { + MENU_ENUM_LABEL_CONTENT_SETTINGS, + deferred_push_content_settings } }; @@ -1200,9 +1212,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label( case MENU_LABEL_RECORD_CONFIG: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_record_configfile); break; - case MENU_LABEL_CONTENT_SETTINGS: - BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_content_settings); - break; case MENU_LABEL_MANAGEMENT: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_management_options); break; @@ -1313,12 +1322,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label( case MENU_LABEL_INPUT_OVERLAY: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_input_overlay); break; - case MENU_LABEL_VIDEO_FONT_PATH: - BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_video_font_path); - break; - case MENU_LABEL_XMB_FONT: - BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_xmb_font_path); - break; case MENU_LABEL_CONTENT_HISTORY_PATH: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_content_history_path); break; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index 488eda10af..43a2f2b77e 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -484,6 +484,22 @@ static struct cbs_title_lbl_callback cbs_title_lbl_list[] = { { MENU_ENUM_LABEL_NETPLAY, action_get_netplay_list + }, + { + MENU_ENUM_LABEL_INFORMATION_LIST, + action_get_title_information_list + }, + { + MENU_ENUM_LABEL_VIDEO_FONT_PATH, + action_get_title_font_path + }, + { + MENU_ENUM_LABEL_XMB_FONT, + action_get_title_font_path + }, + { + MENU_ENUM_LABEL_CONTENT_SETTINGS, + action_get_quick_menu_list } }; @@ -944,9 +960,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_LABEL_RGUI_CONFIG_DIRECTORY: BIND_ACTION_GET_TITLE(cbs, action_get_title_config_directory); break; - case MENU_LABEL_INFORMATION_LIST: - BIND_ACTION_GET_TITLE(cbs, action_get_title_information_list); - break; case MENU_LABEL_DATABASE_MANAGER_LIST: BIND_ACTION_GET_TITLE(cbs, action_get_database_manager_list); break; @@ -971,9 +984,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_LABEL_CORE_OPTIONS: BIND_ACTION_GET_TITLE(cbs, action_get_core_options_list); break; - case MENU_LABEL_CONTENT_SETTINGS: - BIND_ACTION_GET_TITLE(cbs, action_get_quick_menu_list); - break; case MENU_LABEL_CORE_INPUT_REMAPPING_OPTIONS: BIND_ACTION_GET_TITLE(cbs, action_get_input_remapping_options_list); break; @@ -1049,10 +1059,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_LABEL_INPUT_OVERLAY: BIND_ACTION_GET_TITLE(cbs, action_get_title_overlay); break; - case MENU_LABEL_VIDEO_FONT_PATH: - case MENU_LABEL_XMB_FONT: - BIND_ACTION_GET_TITLE(cbs, action_get_title_font_path); - break; case MENU_LABEL_AUDIO_DSP_PLUGIN: BIND_ACTION_GET_TITLE(cbs, action_get_title_audio_filter); break; diff --git a/msg_hash.h b/msg_hash.h index 49ec2a5536..2567ef977d 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1792,21 +1792,9 @@ enum msg_hash_enums #define MENU_LABEL_UPDATE_LAKKA 0x19b51eebU /* Information settings */ - -#define MENU_LABEL_INFORMATION_LIST 0x225e7606U - -#define MENU_LABEL_CONTENT_SETTINGS 0xe789f7f6U - #define MENU_LABEL_SCREEN_RESOLUTION 0x5c9b3a58U -/* Menu settings */ -#define MENU_LABEL_XMB_FONT 0x0ECA56CA2 - -#define MENU_LABEL_PERFCNT_ENABLE 0x6823dbddU - /* Video settings */ -#define MENU_LABEL_VIDEO_FONT_PATH 0xd0de729eU - #define MENU_LABEL_VIDEO_SHADER_PRESET_SAVE_AS 0x3d6e5ce5U #define MENU_LABEL_VIDEO_SHADER_DEFAULT_FILTER 0x4468cb1bU #define MENU_LABEL_VIDEO_SHADER_NUM_PASSES 0x79b2992fU