From f84af7ed8b24434c902f17aa9417a82ef782a383 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 5 Jun 2015 13:03:29 +0200 Subject: [PATCH] (menu_entries_cbs_deferred_push.c) Refactor --- menu/menu_entries_cbs_deferred_push.c | 256 +++++++++++++++----------- 1 file changed, 151 insertions(+), 105 deletions(-) diff --git a/menu/menu_entries_cbs_deferred_push.c b/menu/menu_entries_cbs_deferred_push.c index b0ad584a0f..019e6172ba 100644 --- a/menu/menu_entries_cbs_deferred_push.c +++ b/menu/menu_entries_cbs_deferred_push.c @@ -481,112 +481,158 @@ void menu_entries_cbs_init_bind_deferred_push(menu_file_list_cbs_t *cbs, return; } -#ifdef HAVE_NETWORKING - else if (hash == MENU_LABEL_DEFERRED_CORE_UPDATER_LIST) - cbs->action_deferred_push = deferred_push_core_updater_list; -#endif - else if (hash == MENU_LABEL_HISTORY_LIST) - cbs->action_deferred_push = deferred_push_history_list; - else if (hash == MENU_LABEL_DATABASE_MANAGER_LIST) - cbs->action_deferred_push = deferred_push_database_manager_list; - else if (hash == MENU_LABEL_CURSOR_MANAGER_LIST) - cbs->action_deferred_push = deferred_push_cursor_manager_list; - else if (hash == MENU_LABEL_CHEAT_FILE_LOAD) - cbs->action_deferred_push = deferred_push_cheat_file_load; - else if (hash == MENU_LABEL_REMAP_FILE_LOAD) - cbs->action_deferred_push = deferred_push_remap_file_load; - else if (hash == MENU_LABEL_RECORD_CONFIG) - cbs->action_deferred_push = deferred_push_record_configfile; - else if (hash == MENU_LABEL_CONTENT_ACTIONS) - cbs->action_deferred_push = deferred_push_content_actions; - else if (hash == MENU_LABEL_SHADER_OPTIONS) - cbs->action_deferred_push = deferred_push_shader_options; - else if (hash == MENU_LABEL_VIDEO_OPTIONS) - cbs->action_deferred_push = deferred_push_video_options; - else if (hash == MENU_LABEL_OPTIONS) - cbs->action_deferred_push = deferred_push_options; - else if (hash == MENU_LABEL_MANAGEMENT) - cbs->action_deferred_push = deferred_push_management_options; - else if (type == MENU_SETTING_GROUP) + if (type == MENU_SETTING_GROUP) cbs->action_deferred_push = deferred_push_category; else if (type == MENU_FILE_PLAYLIST_COLLECTION) cbs->action_deferred_push = deferred_push_rdb_collection; - else if ((hash == MENU_LABEL_DEFERRED_CORE_LIST) || - (hash == MENU_LABEL_DEFERRED_CORE_LIST_SET)) - cbs->action_deferred_push = deferred_push_core_list_deferred; - else if (hash == MENU_LABEL_DEFERRED_VIDEO_FILTER) - cbs->action_deferred_push = deferred_push_video_filter; - else if (hash == MENU_LABEL_DEFERRED_DATABASE_MANAGER_LIST) - cbs->action_deferred_push = deferred_push_database_manager_list_deferred; - else if (hash == MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST) - cbs->action_deferred_push = deferred_push_cursor_manager_list_deferred; - else if ( - (hash == MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_PUBLISHER) || - (hash == MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_DEVELOPER) || - (hash == MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ORIGIN) || - (hash == MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_FRANCHISE) || - (hash == MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ENHANCEMENT_HW) || - (hash == MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ESRB_RATING) || - (hash == MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_BBFC_RATING) || - (hash == MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ELSPA_RATING) || - (hash == MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_PEGI_RATING) || - (hash == MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_CERO_RATING) || - (hash == MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_EDGE_MAGAZINE_RATING) || - (hash == MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_EDGE_MAGAZINE_ISSUE) || - (hash == MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_FAMITSU_MAGAZINE_RATING) || - (hash == MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_MAX_USERS) || - (hash == MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_RELEASEMONTH) || - (hash == MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_RELEASEYEAR) - ) - cbs->action_deferred_push = deferred_push_cursor_manager_list_deferred_query_subsearch; - else if (hash == MENU_LABEL_CORE_INFORMATION) - cbs->action_deferred_push = deferred_push_core_information; - else if (hash == MENU_LABEL_SYSTEM_INFORMATION) - cbs->action_deferred_push = deferred_push_system_information; - else if (hash == MENU_LABEL_PERFORMANCE_COUNTERS) - cbs->action_deferred_push = deferred_push_performance_counters; - else if (hash == MENU_LABEL_CORE_COUNTERS) - cbs->action_deferred_push = deferred_push_core_counters; - else if (hash == MENU_LABEL_VIDEO_SHADER_PRESET_PARAMETERS) - cbs->action_deferred_push = deferred_push_video_shader_preset_parameters; - else if (hash == MENU_LABEL_VIDEO_SHADER_PARAMETERS) - cbs->action_deferred_push = deferred_push_video_shader_parameters; - else if (hash == MENU_LABEL_SETTINGS) - cbs->action_deferred_push = deferred_push_settings; - else if (hash == MENU_LABEL_FRONTEND_COUNTERS) - cbs->action_deferred_push = deferred_push_frontend_counters; - else if (hash == MENU_LABEL_CORE_OPTIONS) - cbs->action_deferred_push = deferred_push_core_options; - else if (hash == MENU_LABEL_CORE_CHEAT_OPTIONS) - cbs->action_deferred_push = deferred_push_core_cheat_options; - else if (hash == MENU_LABEL_CORE_INPUT_REMAPPING_OPTIONS) - cbs->action_deferred_push = deferred_push_core_input_remapping_options; - else if (hash == MENU_LABEL_DISK_OPTIONS) - cbs->action_deferred_push = deferred_push_disk_options; - else if (hash == MENU_LABEL_CORE_LIST) - cbs->action_deferred_push = deferred_push_core_list; - else if (hash == MENU_LABEL_CONTENT_COLLECTION_LIST) - cbs->action_deferred_push = deferred_push_content_collection_list; - else if (hash == MENU_LABEL_CONFIGURATIONS) - cbs->action_deferred_push = deferred_push_configurations; - else if (hash == MENU_LABEL_VIDEO_SHADER_PRESET) - cbs->action_deferred_push = deferred_push_video_shader_preset; - else if (hash == MENU_LABEL_VIDEO_SHADER_PASS) - cbs->action_deferred_push = deferred_push_video_shader_pass; - else if (hash == MENU_LABEL_VIDEO_FILTER) - cbs->action_deferred_push = deferred_push_video_filter; - else if (hash == MENU_LABEL_MENU_WALLPAPER) - cbs->action_deferred_push = deferred_push_images; - else if (hash == MENU_LABEL_AUDIO_DSP_PLUGIN) - cbs->action_deferred_push = deferred_push_audio_dsp_plugin; - else if (hash == MENU_LABEL_INPUT_OVERLAY) - cbs->action_deferred_push = deferred_push_input_overlay; - else if (hash == MENU_LABEL_INPUT_OSK_OVERLAY) - cbs->action_deferred_push = deferred_push_input_osk_overlay; - else if (hash == MENU_LABEL_VIDEO_FONT_PATH) - cbs->action_deferred_push = deferred_push_video_font_path; - else if (hash == MENU_LABEL_CONTENT_HISTORY_PATH) - cbs->action_deferred_push = deferred_push_content_history_path; - else if (hash == MENU_LABEL_DETECT_CORE_LIST) - cbs->action_deferred_push = deferred_push_detect_core_list; + else + { + switch (hash) + { + case MENU_LABEL_DEFERRED_CORE_UPDATER_LIST: +#ifdef HAVE_NETWORKING + cbs->action_deferred_push = deferred_push_core_updater_list; +#endif + break; + case MENU_LABEL_HISTORY_LIST: + cbs->action_deferred_push = deferred_push_history_list; + break; + case MENU_LABEL_DATABASE_MANAGER_LIST: + cbs->action_deferred_push = deferred_push_database_manager_list; + break; + case MENU_LABEL_CURSOR_MANAGER_LIST: + cbs->action_deferred_push = deferred_push_cursor_manager_list; + break; + case MENU_LABEL_CHEAT_FILE_LOAD: + cbs->action_deferred_push = deferred_push_cheat_file_load; + break; + case MENU_LABEL_REMAP_FILE_LOAD: + cbs->action_deferred_push = deferred_push_remap_file_load; + break; + case MENU_LABEL_RECORD_CONFIG: + cbs->action_deferred_push = deferred_push_record_configfile; + break; + case MENU_LABEL_CONTENT_ACTIONS: + cbs->action_deferred_push = deferred_push_content_actions; + break; + case MENU_LABEL_SHADER_OPTIONS: + cbs->action_deferred_push = deferred_push_shader_options; + break; + case MENU_LABEL_VIDEO_OPTIONS: + cbs->action_deferred_push = deferred_push_video_options; + break; + case MENU_LABEL_OPTIONS: + cbs->action_deferred_push = deferred_push_options; + break; + case MENU_LABEL_MANAGEMENT: + cbs->action_deferred_push = deferred_push_management_options; + break; + case MENU_LABEL_DEFERRED_CORE_LIST: + case MENU_LABEL_DEFERRED_CORE_LIST_SET: + cbs->action_deferred_push = deferred_push_core_list_deferred; + break; + case MENU_LABEL_DEFERRED_VIDEO_FILTER: + cbs->action_deferred_push = deferred_push_video_filter; + break; + case MENU_LABEL_DEFERRED_DATABASE_MANAGER_LIST: + cbs->action_deferred_push = deferred_push_database_manager_list_deferred; + break; + case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST: + cbs->action_deferred_push = deferred_push_cursor_manager_list_deferred; + break; + case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_PUBLISHER: + case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_DEVELOPER: + case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ORIGIN: + case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_FRANCHISE: + case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ENHANCEMENT_HW: + case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ESRB_RATING: + case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_BBFC_RATING: + case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ELSPA_RATING: + case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_PEGI_RATING: + case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_CERO_RATING: + case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_EDGE_MAGAZINE_RATING: + case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_EDGE_MAGAZINE_ISSUE: + case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_FAMITSU_MAGAZINE_RATING: + case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_MAX_USERS: + case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_RELEASEMONTH: + case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_RELEASEYEAR: + cbs->action_deferred_push = deferred_push_cursor_manager_list_deferred_query_subsearch; + break; + case MENU_LABEL_CORE_INFORMATION: + cbs->action_deferred_push = deferred_push_core_information; + break; + case MENU_LABEL_SYSTEM_INFORMATION: + cbs->action_deferred_push = deferred_push_system_information; + break; + case MENU_LABEL_PERFORMANCE_COUNTERS: + cbs->action_deferred_push = deferred_push_performance_counters; + break; + case MENU_LABEL_CORE_COUNTERS: + cbs->action_deferred_push = deferred_push_core_counters; + break; + case MENU_LABEL_VIDEO_SHADER_PRESET_PARAMETERS: + cbs->action_deferred_push = deferred_push_video_shader_preset_parameters; + break; + case MENU_LABEL_VIDEO_SHADER_PARAMETERS: + cbs->action_deferred_push = deferred_push_video_shader_parameters; + break; + case MENU_LABEL_SETTINGS: + cbs->action_deferred_push = deferred_push_settings; + break; + case MENU_LABEL_FRONTEND_COUNTERS: + cbs->action_deferred_push = deferred_push_frontend_counters; + break; + case MENU_LABEL_CORE_OPTIONS: + cbs->action_deferred_push = deferred_push_core_options; + break; + case MENU_LABEL_CORE_CHEAT_OPTIONS: + cbs->action_deferred_push = deferred_push_core_cheat_options; + break; + case MENU_LABEL_CORE_INPUT_REMAPPING_OPTIONS: + cbs->action_deferred_push = deferred_push_core_input_remapping_options; + break; + case MENU_LABEL_DISK_OPTIONS: + cbs->action_deferred_push = deferred_push_disk_options; + break; + case MENU_LABEL_CORE_LIST: + cbs->action_deferred_push = deferred_push_core_list; + break; + case MENU_LABEL_CONTENT_COLLECTION_LIST: + cbs->action_deferred_push = deferred_push_content_collection_list; + break; + case MENU_LABEL_CONFIGURATIONS: + cbs->action_deferred_push = deferred_push_configurations; + break; + case MENU_LABEL_VIDEO_SHADER_PRESET: + cbs->action_deferred_push = deferred_push_video_shader_preset; + break; + case MENU_LABEL_VIDEO_SHADER_PASS: + cbs->action_deferred_push = deferred_push_video_shader_pass; + break; + case MENU_LABEL_VIDEO_FILTER: + cbs->action_deferred_push = deferred_push_video_filter; + break; + case MENU_LABEL_MENU_WALLPAPER: + cbs->action_deferred_push = deferred_push_images; + break; + case MENU_LABEL_AUDIO_DSP_PLUGIN: + cbs->action_deferred_push = deferred_push_audio_dsp_plugin; + break; + case MENU_LABEL_INPUT_OVERLAY: + cbs->action_deferred_push = deferred_push_input_overlay; + break; + case MENU_LABEL_INPUT_OSK_OVERLAY: + cbs->action_deferred_push = deferred_push_input_osk_overlay; + break; + case MENU_LABEL_VIDEO_FONT_PATH: + cbs->action_deferred_push = deferred_push_video_font_path; + break; + case MENU_LABEL_CONTENT_HISTORY_PATH: + cbs->action_deferred_push = deferred_push_content_history_path; + break; + case MENU_LABEL_DETECT_CORE_LIST: + cbs->action_deferred_push = deferred_push_detect_core_list; + break; + } + } }