mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

(task_content.c) Cut down on some code duplication

Browse Source
This commit is contained in:
twinaphex 2020-07-12 15:45:26 +02:00
parent 72edc1ac7c
commit 6248b1f30a
1 changed files with 26 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
tasks/task_content.c
View File

@ -2202,11 +2202,7 @@ bool task_push_load_content_from_cli(
retro_task_callback_t cb,
void *user_data)
{
/* Load content */
if (!task_load_content_internal(content_info, true, true, false))
return false;
return true;
return task_load_content_internal(content_info, true, true, false);
}
bool task_push_start_builtin_core(
@ -2237,38 +2233,6 @@ bool task_push_start_builtin_core(
return true;
}
bool task_push_load_content_with_current_core_from_companion_ui(
const char *fullpath,
content_ctx_info_t *content_info,
enum rarch_core_type type,
retro_task_callback_t cb,
void *user_data)
{
content_state_t *p_content = content_state_get_ptr();
path_set(RARCH_PATH_CONTENT, fullpath);
/* TODO/FIXME: Enable setting of these values
* via function arguments */
p_content->companion_ui_db_name[0] = '\0';
p_content->companion_ui_crc32[0] = '\0';
/* Load content
* > TODO/FIXME: Set loading_from_companion_ui 'false' for
* now, until someone can implement the required higher
* level functionality in 'win32_common.c' and 'ui_cocoa.m' */
if (!task_load_content_internal(content_info, true, false, false))
return false;
/* Push quick menu onto menu stack */
#ifdef HAVE_MENU
if (type != CORE_TYPE_DUMMY)
menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
#endif
return true;
}
bool task_push_load_content_with_core_from_menu(
const char *fullpath,
content_ctx_info_t *content_info,
@ -2281,7 +2245,9 @@ bool task_push_load_content_with_core_from_menu(
/* Load content */
if (!task_load_content_internal(content_info, true, false, false))
{
#ifdef HAVE_MENU
retroarch_menu_running();
#endif
return false;
}
@ -2294,6 +2260,29 @@ bool task_push_load_content_with_core_from_menu(
return true;
}
bool task_push_load_content_with_current_core_from_companion_ui(
const char *fullpath,
content_ctx_info_t *content_info,
enum rarch_core_type type,
retro_task_callback_t cb,
void *user_data)
{
content_state_t *p_content = content_state_get_ptr();
/* TODO/FIXME: Enable setting of these values
* via function arguments */
p_content->companion_ui_db_name[0] = '\0';
p_content->companion_ui_crc32[0] = '\0';
/* Load content
* > TODO/FIXME: Set loading_from_companion_ui 'false' for
* now, until someone can implement the required higher
* level functionality in 'win32_common.c' and 'ui_cocoa.m' */
return task_push_load_content_with_core_from_menu(fullpath,
content_info, type, cb, user_data);
}
bool task_push_load_subsystem_with_core_from_menu(
const char *fullpath,
content_ctx_info_t *content_info,