From b594ab3d11a641d6a7012680d81e547d00368e3d Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 22 Jan 2017 15:31:27 -0500 Subject: [PATCH 1/3] remove these, no longer needed --- menu/cbs/menu_cbs_ok.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 1bacae0650..7e69666299 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -3130,11 +3130,6 @@ static int action_ok_netplay_connect_room(const char *path, command_event(CMD_EVENT_NETPLAY_DEINIT, NULL); netplay_driver_ctl(RARCH_NETPLAY_CTL_ENABLE_CLIENT, NULL); - /* For testing purposes - strlcpy(tmp_hostname, "192.168.1.241", sizeof(tmp_hostname));*/ - strlcpy(tmp_hostname, - netplay_room_list[idx - 1].address, - sizeof(tmp_hostname)); snprintf(tmp_hostname, sizeof(tmp_hostname), "%s:%d", From 692bedf7d348e171493ab779cb3edfe9351c0100 Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 22 Jan 2017 15:42:38 -0500 Subject: [PATCH 2/3] just reload the game when connecting to a netplay lobby --- menu/cbs/menu_cbs_ok.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 7e69666299..d01a2efca9 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -3140,18 +3140,8 @@ static int action_ok_netplay_connect_room(const char *path, 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()) - { - task_push_netplay_crc_scan(netplay_room_list[idx - 1].gamecrc, - tmp_hostname, netplay_room_list[idx - 1].corename); - } - else - { - /* Enable Netplay itself */ - if (!command_event(CMD_EVENT_NETPLAY_INIT, (void *) tmp_hostname)) - return -1; - } + task_push_netplay_crc_scan(netplay_room_list[idx - 1].gamecrc, + tmp_hostname, netplay_room_list[idx - 1].corename); #else return -1; From 50f3a3318de572d23e53872f1035930b6c7b4aa2 Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 22 Jan 2017 16:02:24 -0500 Subject: [PATCH 3/3] cleanup this --- menu/cbs/menu_cbs_ok.c | 7 +++++-- tasks/task_netplay_crc.c | 10 +++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index d01a2efca9..a8f65b8b89 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -3136,7 +3136,8 @@ static int action_ok_netplay_connect_room(const char *path, netplay_room_list[idx - 1].address, netplay_room_list[idx - 1].port); - RARCH_LOG("%s %s %08x", netplay_room_list[idx - 1].address, + RARCH_LOG("Connecting to: %s with game: %s/%08x", + netplay_room_list[idx - 1].address, netplay_room_list[idx - 1].gamename, netplay_room_list[idx - 1].gamecrc); @@ -3388,6 +3389,8 @@ finish: netplay_room_list[i].gamecrc = atoi(room_data->elems[j + 6].data); netplay_room_list[i].timestamp = atoi(room_data->elems[j + 7].data); +/* Uncomment this to debug mismatched room parameters*/ +#if 0 RARCH_LOG("Room Data: %d\n" "Nickname: %s\n" "Address: %s\n" @@ -3405,7 +3408,7 @@ finish: netplay_room_list[i].gamename, netplay_room_list[i].gamecrc, netplay_room_list[i].timestamp); - +#endif j+=8; snprintf(s, sizeof(s), "Nickname: %s", diff --git a/tasks/task_netplay_crc.c b/tasks/task_netplay_crc.c index a497b90d58..e2b972ad3e 100644 --- a/tasks/task_netplay_crc.c +++ b/tasks/task_netplay_crc.c @@ -80,13 +80,13 @@ static void task_netplay_crc_scan_handler(retro_task_t *task) netplay_crc_handle_t *state = (netplay_crc_handle_t*)task->state; task_set_progress(task, 0); - task_set_title(task, strdup("Checking for ROM presence.")); + task_set_title(task, strdup("Looking for compatible content...")); task_set_finished(task, false); if (!state->lpl_list) { task_set_progress(task, 100); - task_set_title(task, strdup("Playlist directory not found.")); + task_set_title(task, strdup("Playlist directory not found")); task_set_finished(task, true); free(state); return; @@ -113,7 +113,7 @@ static void task_netplay_crc_scan_handler(retro_task_t *task) state->found = true; task_set_data(task, state); task_set_progress(task, 100); - task_set_title(task, strdup("Game found.")); + task_set_title(task, strdup("Compatible content found")); task_set_finished(task, true); string_list_free(state->lpl_list); return; @@ -126,7 +126,7 @@ static void task_netplay_crc_scan_handler(retro_task_t *task) no_playlists: string_list_free(state->lpl_list); task_set_progress(task, 100); - task_set_title(task, strdup("No game found.")); + task_set_title(task, strdup("Couldn't find compatible content")); task_set_finished(task, true); return; } @@ -161,7 +161,7 @@ bool task_push_netplay_crc_scan(uint32_t crc, task->state = state; task->handler = task_netplay_crc_scan_handler; task->callback = netplay_crc_scan_callback; - task->title = strdup("Checking for ROM presence."); + task->title = strdup("Looking for matching content..."); task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);