mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(task_content.c) Cut down on code duplication

Browse Source
This commit is contained in:
LibretroAdmin 2022-10-25 16:32:16 +02:00
parent 069de60efc
commit 44cb5be2ef
1 changed files with 36 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
tasks/task_content.c
View File

@ -1575,7 +1575,7 @@ static void task_push_to_history_list(
tmp[0] = '\0'; tmp[0] = '\0';
#ifdef HAVE_MENU #ifdef HAVE_MENU
/* Push quick menu onto menu stack */ /* Push Quick Menu onto menu stack */
if (launched_from_cli) if (launched_from_cli)
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL); menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
#endif #endif
@ -2222,7 +2222,7 @@ bool task_push_start_current_core(content_ctx_info_t *content_info)
task_push_to_history_list(p_content, true, false, false); task_push_to_history_list(p_content, true, false, false);
#ifdef HAVE_MENU #ifdef HAVE_MENU
/* Push quick menu onto menu stack */ /* Push Quick Menu onto menu stack */
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL); menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
#endif #endif
@ -2340,13 +2340,13 @@ bool task_push_load_contentless_core_from_menu(
command_event(CMD_EVENT_QUIT, NULL); command_event(CMD_EVENT_QUIT, NULL);
#endif #endif
/* Push quick menu onto menu stack */
menu_entries_get_last_stack(NULL, &menu_label, NULL, NULL, NULL); menu_entries_get_last_stack(NULL, &menu_label, NULL, NULL, NULL);
if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_CONTENTLESS_CORES_TAB)) || if (string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_CONTENTLESS_CORES_TAB)) ||
string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONTENTLESS_CORES_LIST))) string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CONTENTLESS_CORES_LIST)))
flush_menu = false; flush_menu = false;
/* Push Quick Menu onto menu stack */
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, &flush_menu); menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, &flush_menu);
#ifdef HAVE_DYNAMIC #ifdef HAVE_DYNAMIC
@ -2456,7 +2456,7 @@ bool task_push_load_content_with_new_core_from_menu(
command_event(CMD_EVENT_QUIT, NULL); command_event(CMD_EVENT_QUIT, NULL);
#endif #endif
/* Push quick menu onto menu stack */ /* Push Quick Menu onto menu stack */
if (type != CORE_TYPE_DUMMY) if (type != CORE_TYPE_DUMMY)
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL); menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
@ -2590,6 +2590,29 @@ end:
return ret; return ret;
} }
static bool task_load_content_internal_wrap(
content_ctx_info_t *content_info,
enum rarch_core_type type,
bool load_from_companion_ui)
{
/* Load content */
if (!task_load_content_internal(content_info, true, false,
load_from_companion_ui))
goto error;
#ifdef HAVE_MENU
/* Push Quick Menu onto menu stack */
if (type != CORE_TYPE_DUMMY)
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
#endif
return true;
error:
#ifdef HAVE_MENU
retroarch_menu_running();
#endif
return false;
}
bool task_push_load_content_with_new_core_from_companion_ui( bool task_push_load_content_with_new_core_from_companion_ui(
const char *core_path, const char *core_path,
const char *fullpath, const char *fullpath,
@ -2604,12 +2627,12 @@ bool task_push_load_content_with_new_core_from_companion_ui(
runloop_state_t *runloop_st = runloop_state_get_ptr(); runloop_state_t *runloop_st = runloop_state_get_ptr();
content_state_t *p_content = content_state_get_ptr(); content_state_t *p_content = content_state_get_ptr();
path_set(RARCH_PATH_CONTENT, fullpath);
path_set(RARCH_PATH_CORE, core_path);
p_content->companion_ui_db_name[0] = '\0'; p_content->companion_ui_db_name[0] = '\0';
p_content->companion_ui_crc32[0] = '\0'; p_content->companion_ui_crc32[0] = '\0';
path_set(RARCH_PATH_CONTENT, fullpath);
path_set(RARCH_PATH_CORE, core_path);
if (!string_is_empty(db_name)) if (!string_is_empty(db_name))
strlcpy(p_content->companion_ui_db_name, strlcpy(p_content->companion_ui_db_name,
db_name, sizeof(p_content->companion_ui_db_name)); db_name, sizeof(p_content->companion_ui_db_name));
@ -2629,16 +2652,7 @@ bool task_push_load_content_with_new_core_from_companion_ui(
else else
runloop_st->name.label[0] = '\0'; runloop_st->name.label[0] = '\0';
/* Load content */ return task_load_content_internal_wrap(content_info, CORE_TYPE_PLAIN, true);
if (!task_load_content_internal(content_info, true, false, true))
return false;
#ifdef HAVE_MENU
/* Push quick menu onto menu stack */
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
#endif
return true;
} }
bool task_push_load_content_from_cli( bool task_push_load_content_from_cli(
@ -2665,21 +2679,10 @@ bool task_push_start_builtin_core(
* load the actual content. Can differ per mode. */ * load the actual content. Can differ per mode. */
runloop_set_current_core_type(type, true); runloop_set_current_core_type(type, true);
/* Load content */ return task_load_content_internal_wrap(content_info, type, false);
#ifdef HAVE_MENU
if (!task_load_content_internal(content_info, true, false, false))
{
retroarch_menu_running();
return false;
}
/* Push quick menu onto menu stack */
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
return true;
#else
return task_load_content_internal(content_info, true, false, false);
#endif
} }
bool task_push_load_content_with_core( bool task_push_load_content_with_core(
const char *fullpath, const char *fullpath,
content_ctx_info_t *content_info, content_ctx_info_t *content_info,
@ -2688,20 +2691,7 @@ bool task_push_load_content_with_core(
void *user_data) void *user_data)
{ {
path_set(RARCH_PATH_CONTENT, fullpath); path_set(RARCH_PATH_CONTENT, fullpath);
/* Load content */ return task_load_content_internal_wrap(content_info, type, false);
#ifdef HAVE_MENU
if (!task_load_content_internal(content_info, true, false, false))
{
retroarch_menu_running();
return false;
}
/* Push quick menu onto menu stack */
if (type != CORE_TYPE_DUMMY)
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
return true;
#else
return task_load_content_internal(content_info, true, false, false);
#endif
} }
bool task_push_load_content_with_current_core_from_companion_ui( bool task_push_load_content_with_current_core_from_companion_ui(
@ -2723,21 +2713,7 @@ bool task_push_load_content_with_current_core_from_companion_ui(
* now, until someone can implement the required higher * now, until someone can implement the required higher
* level functionality in 'win32_common.c' and 'ui_cocoa.m' */ * level functionality in 'win32_common.c' and 'ui_cocoa.m' */
path_set(RARCH_PATH_CONTENT, fullpath); path_set(RARCH_PATH_CONTENT, fullpath);
return task_load_content_internal_wrap(content_info, type, false);
/* Load content */
#ifdef HAVE_MENU
if (!task_load_content_internal(content_info, true, false, false))
{
retroarch_menu_running();
return false;
}
/* Push quick menu onto menu stack */
if (type != CORE_TYPE_DUMMY)
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
return true;
#else
return task_load_content_internal(content_info, true, false, false);
#endif
} }
@ -2751,20 +2727,7 @@ bool task_push_load_subsystem_with_core(
content_state_t *p_content = content_state_get_ptr(); content_state_t *p_content = content_state_get_ptr();
p_content->flags |= CONTENT_ST_FLAG_PENDING_SUBSYSTEM_INIT; p_content->flags |= CONTENT_ST_FLAG_PENDING_SUBSYSTEM_INIT;
/* Load content */ return task_load_content_internal_wrap(content_info, type, false);
#ifdef HAVE_MENU
if (!task_load_content_internal(content_info, true, false, false))
{
retroarch_menu_running();
return false;
}
/* Push quick menu onto menu stack */
if (type != CORE_TYPE_DUMMY)
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
return true;
#else
return task_load_content_internal(content_info, true, false, false);
#endif
} }
uint8_t content_get_flags(void) uint8_t content_get_flags(void)