libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 08:30:16 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge pull request #4481 from fr500/master

Browse Source 
add name matching
This commit is contained in:
Twinaphex 2017-01-23 01:03:16 +01:00 committed by GitHub
commit c78fd7592a
5 changed files with 76 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -1166,7 +1166,7 @@ ifeq ($(HAVE_NETWORKING), 1)
tasks/task_http.o \
tasks/task_netplay_lan_scan.o \
tasks/task_wifi.o \
tasks/task_netplay_crc.o
tasks/task_netplay_find_content.o
ifneq ($(HAVE_SOCKET_LEGACY),1)
OBJ += $(LIBRETRO_COMM_DIR)/net/net_ifinfo.o

2
griffin/griffin.c
View File

@ -910,7 +910,7 @@ NETPLAY
#include "../tasks/task_http.c"
#include "../tasks/task_netplay_lan_scan.c"
#include "../tasks/task_wifi.c"
#include "../tasks/task_netplay_crc.c"
#include "../tasks/task_netplay_find_content.c"
#endif
/*============================================================

3
menu/cbs/menu_cbs_ok.c
View File

@ -3135,12 +3135,13 @@ static int action_ok_netplay_connect_room(const char *path,
netplay_room_list[idx - 1].address,
netplay_room_list[idx - 1].port);
RARCH_LOG("Connecting to: %s with game: %s/%08x",
RARCH_LOG("Connecting to: %s with game: %s/%08x\n",
netplay_room_list[idx - 1].address,
netplay_room_list[idx - 1].gamename,
netplay_room_list[idx - 1].gamecrc);
task_push_netplay_crc_scan(netplay_room_list[idx - 1].gamecrc,
netplay_room_list[idx - 1].gamename,
tmp_hostname, netplay_room_list[idx - 1].corename);
#else

98
tasks/task_netplay_crc.c → tasks/task_netplay_find_content.c
View File

@ -63,12 +63,9 @@ static void netplay_crc_scan_callback(void *task_data,
break;
}
static char content_path[PATH_MAX_LENGTH];
snprintf(content_path, sizeof(content_path), "%s", state->path);
command_event(CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED, state->hostname);
task_push_content_load_default(
info->list[i].path, content_path,
info->list[i].path, state->path,
&content_info,
CORE_TYPE_PLAIN,
CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_MENU,
@ -98,34 +95,79 @@ static void task_netplay_crc_scan_handler(retro_task_t *task)
if (state->lpl_list->size == 0)
goto no_playlists;
for (i = 0; i < state->lpl_list->size; i++)
if (atoi(state->crc) != 0)
{
playlist_t *playlist = NULL;
const char *lpl_path = state->lpl_list->elems[i].data;
if (!strstr(lpl_path, file_path_str(FILE_PATH_LPL_EXTENSION)))
continue;
playlist = playlist_init(lpl_path, 99999);
for (j = 0; j < playlist->size; j++)
for (i = 0; i < state->lpl_list->size; i++)
{
if (string_is_equal(playlist->entries[j].crc32, state->crc))
{
strlcpy(state->path, playlist->entries[j].path, sizeof(state->path));
state->found = true;
task_set_data(task, state);
task_set_progress(task, 100);
task_set_title(task, strdup("Compatible content found"));
task_set_finished(task, true);
string_list_free(state->lpl_list);
return;
}
playlist_t *playlist = NULL;
const char *lpl_path = state->lpl_list->elems[i].data;
task_set_progress(task, (int)(j/playlist->size*100.0));
if (!strstr(lpl_path, file_path_str(FILE_PATH_LPL_EXTENSION)))
continue;
playlist = playlist_init(lpl_path, 99999);
{
for (j = 0; j < playlist->size; j++)
{
if (string_is_equal(playlist->entries[j].crc32, state->crc))
{
strlcpy(state->path, playlist->entries[j].path, sizeof(state->path));
state->found = true;
task_set_data(task, state);
task_set_progress(task, 100);
task_set_title(task, strdup("Compatible content found"));
task_set_finished(task, true);
string_list_free(state->lpl_list);
return;
}
task_set_progress(task, (int)(j/playlist->size*100.0));
}
}
}
}
else
{
for (i = 0; i < state->lpl_list->size; i++)
{
playlist_t *playlist = NULL;
const char *lpl_path = state->lpl_list->elems[i].data;
if (!strstr(lpl_path, file_path_str(FILE_PATH_LPL_EXTENSION)))
continue;
playlist = playlist_init(lpl_path, 99999);
{
for (j = 0; j < playlist->size; j++)
{
/*printf("State: %s Entry: %s\n", state->path, playlist->entries[j].path);*/
if (strstr(playlist->entries[j].path, state->path))
{
printf("Match! %s %s\n", playlist->entries[j].path, state->path);
strlcpy(state->path, playlist->entries[j].path, sizeof(state->path));
state->found = true;
task_set_data(task, state);
task_set_progress(task, 100);
task_set_title(task, strdup("Compatible content found"));
task_set_finished(task, true);
string_list_free(state->lpl_list);
return;
}
task_set_progress(task, (int)(j/playlist->size*100.0));
}
}
}
}
/*
else
{
}
*/
no_playlists:
string_list_free(state->lpl_list);
task_set_progress(task, 100);
@ -134,7 +176,7 @@ no_playlists:
return;
}
bool task_push_netplay_crc_scan(uint32_t crc,
bool task_push_netplay_crc_scan(uint32_t crc, char* name,
const char *hostname, const char *corename)
{
settings_t *settings = config_get_ptr();
@ -146,6 +188,8 @@ bool task_push_netplay_crc_scan(uint32_t crc,
state->crc[0] = '\0';
snprintf(state->crc, sizeof(state->crc), "%08X|crc", crc);
state->path[0] = '\0';
snprintf(state->path, sizeof(state->path), "%s", name);
state->hostname[0] = '\0';
snprintf(state->hostname, sizeof(state->hostname), "%s", hostname);

2
tasks/tasks_internal.h
View File

@ -98,7 +98,7 @@ bool task_push_wifi_scan(void);
bool task_push_netplay_lan_scan(void);
bool task_push_netplay_crc_scan(uint32_t crc,
bool task_push_netplay_crc_scan(uint32_t crc, char* name,
const char *hostname, const char *corename);
#endif