mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 22:14:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reimplement menu_content_load_from_playlist

Browse Source
This commit is contained in:
twinaphex 2016-05-16 14:54:26 +02:00
parent 75160c6524
commit 923d0a879b
3 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
menu/menu_content.c
View File

@ -36,6 +36,8 @@
#include "../runloop.h"
#include "../verbosity.h"
#include "../tasks/tasks_internal.h"
static void menu_content_environment_get(int *argc, char *argv[],
void *args, void *params_data)
{
@ -141,11 +143,11 @@ error:
static bool menu_content_load_from_playlist(void *data)
{
unsigned idx;
playlist_t *playlist = NULL;
const char *core_path = NULL;
const char *path = NULL;
menu_content_ctx_playlist_info_t *info =
(menu_content_ctx_playlist_info_t *)data;
playlist_t *playlist = NULL;
if (!info)
return false;
@ -188,19 +190,15 @@ static bool menu_content_load_from_playlist(void *data)
goto error;
}
runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)core_path);
if (path)
menu_driver_ctl(RARCH_MENU_CTL_UNSET_LOAD_NO_CONTENT, NULL);
else
menu_driver_ctl(RARCH_MENU_CTL_SET_LOAD_NO_CONTENT, NULL);
if (!command_event(CMD_EVENT_EXEC, (void*)path))
return false;
command_event(CMD_EVENT_LOAD_CORE, NULL);
return true;
if (rarch_task_push_content_load_default(
core_path,
path,
false,
CORE_TYPE_PLAIN,
CONTENT_MODE_LOAD_CONTENT_FROM_PLAYLIST_FROM_MENU,
NULL,
NULL))
return true;
error:
runloop_msg_queue_push("File could not be loaded.\n", 1, 100, true);

13
tasks/task_content.c
View File

@ -118,6 +118,19 @@ bool rarch_task_push_content_load_default(
}
#endif
break;
case CONTENT_MODE_LOAD_CONTENT_FROM_PLAYLIST_FROM_MENU:
runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)core_path);
if (fullpath)
menu_driver_ctl(RARCH_MENU_CTL_UNSET_LOAD_NO_CONTENT, NULL);
else
menu_driver_ctl(RARCH_MENU_CTL_SET_LOAD_NO_CONTENT, NULL);
if (!command_event(CMD_EVENT_EXEC, (void*)fullpath))
return false;
command_event(CMD_EVENT_LOAD_CORE, NULL);
break;
case CONTENT_MODE_LOAD_NONE:
break;
}

3
tasks/tasks_internal.h
View File

@ -41,7 +41,8 @@ enum content_mode_load
CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_MENU,
CONTENT_MODE_LOAD_CONTENT_WITH_FFMPEG_CORE_FROM_MENU,
CONTENT_MODE_LOAD_CONTENT_WITH_IMAGEVIEWER_CORE_FROM_MENU,
CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_COMPANION_UI
CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_COMPANION_UI,
CONTENT_MODE_LOAD_CONTENT_FROM_PLAYLIST_FROM_MENU
};
enum nbio_status_enum