From c80d18c446b00e2e9a08ac51169436a9c865c90d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 2 Dec 2019 02:33:09 +0100 Subject: [PATCH] Refactor DEFERRED_RECORDING_SETTINGS_LIST --- menu/cbs/menu_cbs_deferred_push.c | 4 +--- menu/cbs/menu_cbs_title.c | 9 ++++++--- msg_hash.h | 1 - 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index 68dede94d3..6ef2f69341 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -751,6 +751,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label( {MENU_ENUM_LABEL_DEFERRED_VIDEO_SHADER_PRESET_REMOVE_LIST, deferred_push_video_shader_preset_remove}, {MENU_ENUM_LABEL_DEFERRED_DROPDOWN_BOX_LIST_MANUAL_CONTENT_SCAN_SYSTEM_NAME, deferred_push_dropdown_box_list_manual_content_scan_system_name}, {MENU_ENUM_LABEL_DEFERRED_DROPDOWN_BOX_LIST_MANUAL_CONTENT_SCAN_CORE_NAME, deferred_push_dropdown_box_list_manual_content_scan_core_name}, + {MENU_ENUM_LABEL_DEFERRED_RECORDING_SETTINGS_LIST, deferred_push_recording_settings_list}, }; for (i = 0; i < ARRAY_SIZE(info_list); i++) @@ -1120,9 +1121,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label( case MENU_LABEL_DEFERRED_PLAYLIST_MANAGER_SETTINGS: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_playlist_manager_settings); break; - 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; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index b8af91998d..d01d6332fe 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -878,6 +878,12 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, BIND_ACTION_GET_TITLE(cbs, action_get_online_updater_list); return 0; } + else if (string_is_equal(label, msg_hash_to_str( + MENU_ENUM_LABEL_DEFERRED_RECORDING_SETTINGS_LIST))) + { + BIND_ACTION_GET_TITLE(cbs, action_get_recording_settings_list); + return 0; + } else if (cbs->enum_idx != MSG_UNKNOWN) { switch (cbs->enum_idx) @@ -1470,9 +1476,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_LABEL_DEFERRED_INPUT_SETTINGS_LIST: BIND_ACTION_GET_TITLE(cbs, action_get_input_settings_list); break; - case MENU_LABEL_DEFERRED_RECORDING_SETTINGS_LIST: - BIND_ACTION_GET_TITLE(cbs, action_get_recording_settings_list); - break; case MENU_LABEL_DEFERRED_PLAYLIST_SETTINGS_LIST: BIND_ACTION_GET_TITLE(cbs, action_get_playlist_settings_list); break; diff --git a/msg_hash.h b/msg_hash.h index ae3533f66f..0b673fcf9e 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -2723,7 +2723,6 @@ enum msg_hash_enums #define MENU_LABEL_DEFERRED_DRIVER_SETTINGS_LIST 0xaa5efefcU #define MENU_LABEL_DEFERRED_VIDEO_SETTINGS_LIST 0x83c65827U #define MENU_LABEL_DEFERRED_AUDIO_SETTINGS_LIST 0x5bba25e2U -#define MENU_LABEL_DEFERRED_RECORDING_SETTINGS_LIST 0x05548d52U #define MENU_LABEL_DEFERRED_PLAYLIST_SETTINGS_LIST 0x9518e0c7U #define MENU_LABEL_DEFERRED_PLAYLIST_MANAGER_LIST 0xD7232C4CU #define MENU_LABEL_DEFERRED_PLAYLIST_MANAGER_SETTINGS 0x16ACEF81U