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

More preparatory work for net retropad core

Browse Source
This commit is contained in:
twinaphex 2016-05-27 21:16:25 +02:00
parent c0d86cd8d3
commit 954aaa3fc6
3 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
retroarch.c
View File

@ -108,6 +108,7 @@ enum
static bool current_core_explicitly_set = false;
static enum rarch_core_type current_core_type;
static enum rarch_core_type explicit_current_core_type;
static char current_savefile_dir[PATH_MAX_LENGTH];
static char error_string[PATH_MAX_LENGTH];
@ -690,7 +691,8 @@ static void retroarch_parse_input(int argc, char *argv[])
* bogus arguments.
*/
current_core_type = CORE_TYPE_DUMMY;
retroarch_set_current_core_type(CORE_TYPE_DUMMY, false);
*global->subsystem = '\0';
global->has_set.save_path = false;
global->has_set.state_path = false;
@ -846,7 +848,7 @@ static void retroarch_parse_input(int argc, char *argv[])
global->has_set.libretro = true;
/* We requested explicit core, so use PLAIN core type. */
current_core_type = CORE_TYPE_PLAIN;
retroarch_set_current_core_type(CORE_TYPE_PLAIN, false);
}
else
{
@ -1043,20 +1045,20 @@ static void retroarch_parse_input(int argc, char *argv[])
{
/* Allow stray -L arguments to go through to workaround cases where it's used as "config file".
* This seems to still be the case for Android, which should be properly fixed. */
current_core_type = CORE_TYPE_DUMMY;
retroarch_set_current_core_type(CORE_TYPE_DUMMY, false);
}
}
if (!*global->subsystem && optind < argc)
{
/* We requested explicit ROM, so use PLAIN core type. */
current_core_type = CORE_TYPE_PLAIN;
retroarch_set_current_core_type(CORE_TYPE_PLAIN, false);
retroarch_set_pathnames((const char*)argv[optind]);
}
else if (*global->subsystem && optind < argc)
{
/* We requested explicit ROM, so use PLAIN core type. */
current_core_type = CORE_TYPE_PLAIN;
retroarch_set_current_core_type(CORE_TYPE_PLAIN, false);
retroarch_set_special_paths(argv + optind, argc - optind);
}
else
@ -1297,9 +1299,6 @@ bool retroarch_main_init(int argc, char *argv[])
runloop_ctl(RUNLOOP_CTL_TASK_INIT, NULL);
if (current_core_explicitly_set)
current_core_explicitly_set = false;
else
{
settings_t *settings = config_get_ptr();
@ -1321,7 +1320,7 @@ bool retroarch_main_init(int argc, char *argv[])
{
#ifdef HAVE_FFMPEG
global->has_set.libretro = false;
current_core_type = CORE_TYPE_FFMPEG;
retroarch_set_current_core_type(CORE_TYPE_FFMPEG, false);
#endif
}
break;
@ -1330,7 +1329,7 @@ bool retroarch_main_init(int argc, char *argv[])
if (settings->multimedia.builtin_imageviewer_enable)
{
global->has_set.libretro = false;
current_core_type = CORE_TYPE_IMAGEVIEWER;
retroarch_set_current_core_type(CORE_TYPE_IMAGEVIEWER, false);
}
break;
#endif
@ -1340,9 +1339,15 @@ bool retroarch_main_init(int argc, char *argv[])
}
}
}
driver_ctl(RARCH_DRIVER_CTL_INIT_PRE, NULL);
if (!command_event(CMD_EVENT_CORE_INIT, &current_core_type))
if (current_core_explicitly_set)
{
current_core_explicitly_set = false;
if (!command_event(CMD_EVENT_CORE_INIT, &explicit_current_core_type))
goto error;
}
else if (!command_event(CMD_EVENT_CORE_INIT, &current_core_type))
goto error;
driver_ctl(RARCH_DRIVER_CTL_INIT_ALL, NULL);
@ -1643,10 +1648,15 @@ int retroarch_get_capabilities(enum rarch_capabilities type,
return 0;
}
void retroarch_set_current_core_type(enum rarch_core_type type)
void retroarch_set_current_core_type(enum rarch_core_type type, bool explicitly_set)
{
current_core_explicitly_set = true;
current_core_type = type;
if (explicitly_set && !current_core_explicitly_set)
{
current_core_explicitly_set = true;
explicit_current_core_type = type;
}
else
current_core_type = type;
}
/**

2
retroarch.h
View File

@ -154,7 +154,7 @@ void retroarch_set_pathnames(const char *path);
void retroarch_fill_pathnames(void);
void retroarch_set_current_core_type(enum rarch_core_type type);
void retroarch_set_current_core_type(enum rarch_core_type type, bool explicitly_set);
/**
* retroarch_fail:

10
tasks/task_content.c
View File

@ -26,6 +26,10 @@
#include <file/file_path.h>
#include <string/stdstring.h>
#ifdef HAVE_CONFIG_H
#include "../config.h"
#endif
#ifdef HAVE_MENU
#include "../menu/menu_driver.h"
#include "../menu/menu_display.h"
@ -1751,9 +1755,11 @@ bool task_push_content_load_default(
break;
case CONTENT_MODE_LOAD_NOTHING_WITH_NET_RETROPAD_CORE_FROM_MENU:
#if defined(HAVE_NETWORK) && defined(HAVE_NETWORK_GAMEPAD)
runloop_set_current_core_type(CORE_TYPE_NETRETROPAD, true);
core_path = settings->path.libretro; /* TODO/FIXME */
runloop_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL);
runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)core_path);
#ifdef HAVE_DYNAMIC
command_event(CMD_EVENT_LOAD_CORE, NULL);
#endif
@ -1761,8 +1767,10 @@ bool task_push_content_load_default(
if (!content_load_wrapper(content_info, true))
goto error;
#endif
#endif
return true;
#else
break;
#endif
case CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_MENU:
core_path = settings->path.libretro;
runloop_ctl(RUNLOOP_CTL_SET_CONTENT_PATH, (void*)fullpath);