From a0e6a24f38a40d1e0a06d46500001aeb5b9aabee Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 22 Jan 2017 13:07:30 -0500 Subject: [PATCH] use deferred netplay init --- menu/cbs/menu_cbs_ok.c | 2 +- network/netplay/netplay_frontend.c | 2 -- tasks/task_netplay_crc.c | 5 +---- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 0cde92d32f..a403645904 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -3132,7 +3132,7 @@ static int action_ok_netplay_connect_room(const char *path, strlcpy(tmp_hostname, netplay_room_list[idx - 1].address, sizeof(tmp_hostname)); snprintf(tmp_hostname, sizeof(tmp_hostname), "%s:%d", netplay_room_list[idx - 1].address, netplay_room_list[idx - 1].port); - + RARCH_LOG("%s %s %08x", netplay_room_list[idx - 1].address, netplay_room_list[idx - 1].gamename, netplay_room_list[idx - 1].gamecrc); /* If we haven't yet started, this will load on its own */ if (!content_is_inited()) { diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c index 09c9211591..f63c178155 100644 --- a/network/netplay/netplay_frontend.c +++ b/network/netplay/netplay_frontend.c @@ -164,8 +164,6 @@ static bool get_self_input_state(netplay_t *netplay) bool init_netplay_deferred(const char* server, unsigned port) { - - RARCH_LOG("deferred! %s\n", server); if (!string_is_empty(server) && port != 0) { strlcpy(server_address_deferred, server, sizeof(server_address_deferred)); diff --git a/tasks/task_netplay_crc.c b/tasks/task_netplay_crc.c index 8b05bff0b8..47fbf7d32e 100644 --- a/tasks/task_netplay_crc.c +++ b/tasks/task_netplay_crc.c @@ -46,8 +46,6 @@ typedef struct static void netplay_crc_scan_callback(void *task_data, void *user_data, const char *error) { - printf("CALLBACK\n"); - netplay_crc_handle_t *state = (netplay_crc_handle_t*)task_data; if (!state) @@ -56,8 +54,7 @@ static void netplay_crc_scan_callback(void *task_data, printf("%s\n", state->hostname); printf("%s\n", state->path); printf("%s\n", state->corename); - - command_event(CMD_EVENT_NETPLAY_INIT, state->hostname); + command_event(CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED, state->hostname); free(state); }