thirdparty/retroarch
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor this code to be able to check for proper extension support before loading

Browse source
This commit is contained in:
radius 2017-01-24 18:35:57 -05:00
parent 4b476cfe5f
commit 080a9632f9
1 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

35
tasks/task_netplay_find_content.c
View file

@ -42,33 +42,25 @@ typedef struct
char path[PATH_MAX_LENGTH]; char path[PATH_MAX_LENGTH];
char hostname[512]; char hostname[512];
char corename[PATH_MAX_LENGTH]; char corename[PATH_MAX_LENGTH];
char corepath[PATH_MAX_LENGTH];
char coreext[PATH_MAX_LENGTH];
bool found; bool found;
} netplay_crc_handle_t; } netplay_crc_handle_t;
static void netplay_crc_scan_callback(void *task_data, static void netplay_crc_scan_callback(void *task_data,
void *user_data, const char *error) void *user_data, const char *error)
{ {
int i;
netplay_crc_handle_t *state = (netplay_crc_handle_t*)task_data; netplay_crc_handle_t *state = (netplay_crc_handle_t*)task_data;
core_info_list_t *info = NULL;
content_ctx_info_t content_info = {0}; content_ctx_info_t content_info = {0};
core_info_get_list(&info);
if (!state) if (!state)
return; return;
for (i=0; i < info->count; i++) if (!string_is_empty(state->corepath) && !string_is_empty(state->path))
{
if(string_is_equal(info->list[i].core_name, state->corename))
break;
}
if (!string_is_empty(info->list[i].path) && !string_is_empty(state->path))
{ {
command_event(CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED, state->hostname); command_event(CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED, state->hostname);
task_push_content_load_default( task_push_content_load_default(
info->list[i].path, state->path, state->corepath, state->path,
&content_info, &content_info,
CORE_TYPE_PLAIN, CORE_TYPE_PLAIN,
CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_MENU, CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_MENU,
@ -205,9 +197,13 @@ no_playlists:
bool task_push_netplay_crc_scan(uint32_t crc, char* name, bool task_push_netplay_crc_scan(uint32_t crc, char* name,
const char *hostname, const char *corename) const char *hostname, const char *corename)
{ {
int i;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
retro_task_t *task = (retro_task_t *)calloc(1, sizeof(*task)); retro_task_t *task = (retro_task_t *)calloc(1, sizeof(*task));
netplay_crc_handle_t *state = (netplay_crc_handle_t*)calloc(1, sizeof(*state)); netplay_crc_handle_t *state = (netplay_crc_handle_t*)calloc(1, sizeof(*state));
core_info_list_t *info = NULL;
core_info_get_list(&info);
if (!task || !state) if (!task || !state)
goto error; goto error;
@ -223,11 +219,26 @@ bool task_push_netplay_crc_scan(uint32_t crc, char* name,
state->corename[0] = '\0'; state->corename[0] = '\0';
snprintf(state->corename, sizeof(state->corename), "%s", corename); snprintf(state->corename, sizeof(state->corename), "%s", corename);
state->lpl_list = dir_list_new(settings->directory.playlist, state->lpl_list = dir_list_new(settings->directory.playlist,
NULL, true, true, true, false); NULL, true, true, true, false);
state->found = false; state->found = false;
for (i=0; i < info->count; i++)
{
/* check if the core name matches.
TO-DO :we could try to load the core too to check
if the version string matches too */
if(string_is_equal(info->list[i].core_name, state->corename))
{
snprintf(state->corepath, sizeof(state->corepath), "%s", info->list[i].path);
snprintf(state->coreext, sizeof(state->coreext), "%s", info->list[i].supported_extensions);
break;
}
}
/* blocking means no other task can run while this one is running, /* blocking means no other task can run while this one is running,
* which is the default */ * which is the default */
task->type = TASK_TYPE_BLOCKING; task->type = TASK_TYPE_BLOCKING;