mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename load content tasks

Browse Source
This commit is contained in:
twinaphex 2017-02-21 18:36:38 +01:00
parent 460e28f7e5
commit 0789fff6df
4 changed files with 63 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
menu/cbs/menu_cbs_ok.c
View File

@ -905,22 +905,6 @@ int generic_action_ok_displaylist_push(const char *path,
return menu_cbs_exit(); return menu_cbs_exit();
} }
static int generic_action_ok_file_load(const char *corepath, const char *fullpath,
enum rarch_core_type action_type, enum content_mode_load content_enum_idx)
{
content_ctx_info_t content_info = {0};
if (!task_push_content_load_default(
corepath, fullpath,
&content_info,
action_type,
content_enum_idx,
NULL, NULL))
return -1;
return 0;
}
static int file_load_with_detect_core_wrapper( static int file_load_with_detect_core_wrapper(
enum msg_hash_enums enum_label_idx, enum msg_hash_enums enum_label_idx,
enum msg_hash_enums enum_idx, enum msg_hash_enums enum_idx,
@ -984,7 +968,7 @@ static int file_load_with_detect_core_wrapper(
{ {
content_ctx_info_t content_info = {0}; content_ctx_info_t content_info = {0};
if (!task_push_content_load_content_with_new_core_from_menu( if (!task_push_load_content_with_new_core_from_menu(
new_core_path, def_info.s, new_core_path, def_info.s,
&content_info, &content_info,
CORE_TYPE_PLAIN, CORE_TYPE_PLAIN,
@ -1280,6 +1264,7 @@ static int action_ok_file_load(const char *path,
{ {
char menu_path_new[PATH_MAX_LENGTH]; char menu_path_new[PATH_MAX_LENGTH];
char full_path_new[PATH_MAX_LENGTH]; char full_path_new[PATH_MAX_LENGTH];
content_ctx_info_t content_info = {0};
const char *menu_label = NULL; const char *menu_label = NULL;
const char *menu_path = NULL; const char *menu_path = NULL;
rarch_setting_t *setting = NULL; rarch_setting_t *setting = NULL;
@ -1324,9 +1309,14 @@ static int action_ok_file_load(const char *path,
break; break;
} }
return generic_action_ok_file_load(NULL, full_path_new, if (!task_push_load_content_with_core_from_menu(
full_path_new,
&content_info,
CORE_TYPE_PLAIN, CORE_TYPE_PLAIN,
CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_MENU); NULL, NULL))
return -1;
return 0;
} }
static int action_ok_playlist_entry_collection(const char *path, static int action_ok_playlist_entry_collection(const char *path,
@ -1450,7 +1440,7 @@ static int action_ok_playlist_entry_collection(const char *path,
playlist_info.idx, &path, NULL, NULL, NULL, NULL, NULL); playlist_info.idx, &path, NULL, NULL, NULL, NULL, NULL);
if (!task_push_content_load_content_from_playlist_from_menu( if (!task_push_load_content_from_playlist_from_menu(
new_core_path, path, new_core_path, path,
&content_info, &content_info,
NULL, NULL)) NULL, NULL))
@ -1539,7 +1529,7 @@ static int action_ok_playlist_entry(const char *path,
playlist_get_index(playlist, playlist_get_index(playlist,
playlist_info.idx, &path, NULL, NULL, NULL, NULL, NULL); playlist_info.idx, &path, NULL, NULL, NULL, NULL, NULL);
if (!task_push_content_load_content_from_playlist_from_menu( if (!task_push_load_content_from_playlist_from_menu(
core_path, path, core_path, path,
&content_info, &content_info,
NULL, NULL)) NULL, NULL))
@ -1647,7 +1637,7 @@ static int action_ok_playlist_entry_start_content(const char *path,
playlist_get_index(playlist, playlist_get_index(playlist,
playlist_info.idx, &path, NULL, NULL, NULL, NULL, NULL); playlist_info.idx, &path, NULL, NULL, NULL, NULL, NULL);
if (!task_push_content_load_content_from_playlist_from_menu( if (!task_push_load_content_from_playlist_from_menu(
core_path, path, core_path, path,
&content_info, &content_info,
NULL, NULL)) NULL, NULL))
@ -2143,7 +2133,7 @@ static int action_ok_load_core_deferred(const char *path,
if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
return menu_cbs_exit(); return menu_cbs_exit();
if (!task_push_content_load_content_with_new_core_from_menu( if (!task_push_load_content_with_new_core_from_menu(
path, menu->deferred_path, path, menu->deferred_path,
&content_info, &content_info,
CORE_TYPE_PLAIN, CORE_TYPE_PLAIN,
@ -2186,6 +2176,7 @@ static int action_ok_file_load_ffmpeg(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
char new_path[PATH_MAX_LENGTH]; char new_path[PATH_MAX_LENGTH];
content_ctx_info_t content_info = {0};
const char *menu_path = NULL; const char *menu_path = NULL;
file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0);
menu_entries_get_last(menu_stack, &menu_path, NULL, NULL, NULL); menu_entries_get_last(menu_stack, &menu_path, NULL, NULL, NULL);
@ -2194,9 +2185,15 @@ static int action_ok_file_load_ffmpeg(const char *path,
fill_pathname_join(new_path, menu_path, path, fill_pathname_join(new_path, menu_path, path,
sizeof(new_path)); sizeof(new_path));
return generic_action_ok_file_load(NULL, new_path,
if (!task_push_load_content_with_core_from_menu(
new_path,
&content_info,
CORE_TYPE_FFMPEG, CORE_TYPE_FFMPEG,
CONTENT_MODE_LOAD_CONTENT_WITH_FFMPEG_CORE_FROM_MENU); NULL, NULL))
return -1;
return 0;
} }
#endif #endif
@ -2204,6 +2201,7 @@ static int action_ok_file_load_imageviewer(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
char fullpath[PATH_MAX_LENGTH]; char fullpath[PATH_MAX_LENGTH];
content_ctx_info_t content_info = {0};
const char *menu_path = NULL; const char *menu_path = NULL;
file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0);
menu_entries_get_last(menu_stack, &menu_path, NULL, NULL, NULL); menu_entries_get_last(menu_stack, &menu_path, NULL, NULL, NULL);
@ -2212,16 +2210,30 @@ static int action_ok_file_load_imageviewer(const char *path,
fill_pathname_join(fullpath, menu_path, path, fill_pathname_join(fullpath, menu_path, path,
sizeof(fullpath)); sizeof(fullpath));
return generic_action_ok_file_load(NULL, fullpath,
if (!task_push_load_content_with_core_from_menu(
fullpath,
&content_info,
CORE_TYPE_IMAGEVIEWER, CORE_TYPE_IMAGEVIEWER,
CONTENT_MODE_LOAD_CONTENT_WITH_IMAGEVIEWER_CORE_FROM_MENU); NULL, NULL))
return -1;
return 0;
} }
static int action_ok_file_load_current_core(const char *path, static int action_ok_file_load_current_core(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
return generic_action_ok_file_load(path, detect_content_path, content_ctx_info_t content_info = {0};
CORE_TYPE_FFMPEG, CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_MENU);
if (!task_push_load_content_with_core_from_menu(
detect_content_path,
&content_info,
CORE_TYPE_PLAIN,
NULL, NULL))
return -1;
return 0;
} }
static int action_ok_file_load_detect_core(const char *path, static int action_ok_file_load_detect_core(const char *path,
@ -2229,7 +2241,7 @@ static int action_ok_file_load_detect_core(const char *path,
{ {
content_ctx_info_t content_info = {0}; content_ctx_info_t content_info = {0};
if (!task_push_content_load_content_with_new_core_from_menu( if (!task_push_load_content_with_new_core_from_menu(
path, detect_content_path, path, detect_content_path,
&content_info, &content_info,
CORE_TYPE_FFMPEG, CORE_TYPE_FFMPEG,
@ -3721,6 +3733,7 @@ static int action_ok_open_archive(const char *path,
static int action_ok_load_archive(const char *path, static int action_ok_load_archive(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
content_ctx_info_t content_info = {0};
menu_handle_t *menu = NULL; menu_handle_t *menu = NULL;
const char *menu_path = NULL; const char *menu_path = NULL;
const char *content_path = NULL; const char *content_path = NULL;
@ -3736,9 +3749,14 @@ static int action_ok_load_archive(const char *path,
command_event(CMD_EVENT_LOAD_CORE, NULL); command_event(CMD_EVENT_LOAD_CORE, NULL);
return generic_action_ok_file_load(NULL, detect_content_path, if (!task_push_load_content_with_core_from_menu(
detect_content_path,
&content_info,
CORE_TYPE_PLAIN, CORE_TYPE_PLAIN,
CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_MENU); NULL, NULL))
return -1;
return 0;
} }
static int action_ok_load_archive_detect_core(const char *path, static int action_ok_load_archive_detect_core(const char *path,
@ -3785,7 +3803,7 @@ static int action_ok_load_archive_detect_core(const char *path,
{ {
content_ctx_info_t content_info = {0}; content_ctx_info_t content_info = {0};
if (!task_push_content_load_content_with_new_core_from_menu( if (!task_push_load_content_with_new_core_from_menu(
new_core_path, def_info.s, new_core_path, def_info.s,
&content_info, &content_info,
CORE_TYPE_PLAIN, CORE_TYPE_PLAIN,

51
tasks/task_content.c
View File

@ -1074,7 +1074,7 @@ error:
return false; return false;
} }
bool task_push_content_load_content_from_playlist_from_menu( bool task_push_load_content_from_playlist_from_menu(
const char *core_path, const char *core_path,
const char *fullpath, const char *fullpath,
content_ctx_info_t *content_info, content_ctx_info_t *content_info,
@ -1274,7 +1274,7 @@ bool task_push_load_new_core(
return true; return true;
} }
bool task_push_content_load_content_with_new_core_from_menu( bool task_push_load_content_with_new_core_from_menu(
const char *core_path, const char *core_path,
const char *fullpath, const char *fullpath,
content_ctx_info_t *content_info, content_ctx_info_t *content_info,
@ -1444,21 +1444,6 @@ static bool task_load_content_callback(content_ctx_info_t *content_info,
return true; return true;
} }
static bool task_loading_from_menu(enum content_mode_load mode)
{
switch (mode)
{
case CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_MENU:
case CONTENT_MODE_LOAD_CONTENT_WITH_FFMPEG_CORE_FROM_MENU:
case CONTENT_MODE_LOAD_CONTENT_WITH_IMAGEVIEWER_CORE_FROM_MENU:
return true;
default:
break;
}
return false;
}
bool task_push_content_load_content_with_new_core_from_companion_ui( bool task_push_content_load_content_with_new_core_from_companion_ui(
const char *core_path, const char *core_path,
const char *fullpath, const char *fullpath,
@ -1565,45 +1550,23 @@ bool task_push_load_content_with_current_core_from_companion_ui(
return true; return true;
} }
bool task_push_content_load_default( bool task_push_load_content_with_core_from_menu(
const char *core_path,
const char *fullpath, const char *fullpath,
content_ctx_info_t *content_info, content_ctx_info_t *content_info,
enum rarch_core_type type, enum rarch_core_type type,
enum content_mode_load mode,
retro_task_callback_t cb, retro_task_callback_t cb,
void *user_data) void *user_data)
{ {
/* Set content path */ /* Set content path */
switch (mode) path_set(RARCH_PATH_CONTENT, fullpath);
{
case CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_MENU:
case CONTENT_MODE_LOAD_CONTENT_WITH_FFMPEG_CORE_FROM_MENU:
case CONTENT_MODE_LOAD_CONTENT_WITH_IMAGEVIEWER_CORE_FROM_MENU:
path_set(RARCH_PATH_CONTENT, fullpath);
break;
default:
break;
}
/* Load content */ /* Load content */
switch (mode) if (!task_load_content_callback(content_info, true, false))
{ {
case CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_MENU:
case CONTENT_MODE_LOAD_CONTENT_WITH_FFMPEG_CORE_FROM_MENU:
case CONTENT_MODE_LOAD_CONTENT_WITH_IMAGEVIEWER_CORE_FROM_MENU:
if (!task_load_content_callback(content_info, true, false))
{
#ifdef HAVE_MENU #ifdef HAVE_MENU
if (task_loading_from_menu(mode)) rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL);
rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL);
#endif #endif
return false; return false;
}
break;
case CONTENT_MODE_LOAD_NONE:
default:
break;
} }
/* Push quick menu onto menu stack */ /* Push quick menu onto menu stack */

2
tasks/task_netplay_find_content.c
View File

@ -62,7 +62,7 @@ static void netplay_crc_scan_callback(void *task_data,
!string_is_equal(state->content_path, "N/A")) !string_is_equal(state->content_path, "N/A"))
{ {
command_event(CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED, state->hostname); command_event(CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED, state->hostname);
task_push_content_load_content_with_new_core_from_menu( task_push_load_content_with_new_core_from_menu(
state->core_path, state->content_path, state->core_path, state->content_path,
&content_info, &content_info,
CORE_TYPE_PLAIN, CORE_TYPE_PLAIN,

10
tasks/tasks_internal.h
View File

@ -166,14 +166,14 @@ bool task_push_start_current_core(content_ctx_info_t *content_info);
bool task_push_start_dummy_core(content_ctx_info_t *content_info); bool task_push_start_dummy_core(content_ctx_info_t *content_info);
bool task_push_content_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,
content_ctx_info_t *content_info, content_ctx_info_t *content_info,
retro_task_callback_t cb, retro_task_callback_t cb,
void *user_data); void *user_data);
bool task_push_content_load_content_with_new_core_from_menu( bool task_push_load_content_with_new_core_from_menu(
const char *core_path, const char *core_path,
const char *fullpath, const char *fullpath,
content_ctx_info_t *content_info, content_ctx_info_t *content_info,
@ -181,19 +181,17 @@ bool task_push_content_load_content_with_new_core_from_menu(
retro_task_callback_t cb, retro_task_callback_t cb,
void *user_data); void *user_data);
bool task_push_content_load_content_from_playlist_from_menu( bool task_push_load_content_from_playlist_from_menu(
const char *core_path, const char *core_path,
const char *fullpath, const char *fullpath,
content_ctx_info_t *content_info, content_ctx_info_t *content_info,
retro_task_callback_t cb, retro_task_callback_t cb,
void *user_data); void *user_data);
bool task_push_content_load_default( bool task_push_load_content_with_core_from_menu(
const char *core_path,
const char *fullpath, const char *fullpath,
content_ctx_info_t *content_info, content_ctx_info_t *content_info,
enum rarch_core_type type, enum rarch_core_type type,
enum content_mode_load mode,
retro_task_callback_t cb, retro_task_callback_t cb,
void *user_data); void *user_data);