cleanup this

This commit is contained in:
radius 2017-01-22 16:02:24 -05:00
parent 692bedf7d3
commit 50f3a3318d
2 changed files with 10 additions and 7 deletions

View File

@ -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].address,
netplay_room_list[idx - 1].port); 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].gamename,
netplay_room_list[idx - 1].gamecrc); 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].gamecrc = atoi(room_data->elems[j + 6].data);
netplay_room_list[i].timestamp = atoi(room_data->elems[j + 7].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" RARCH_LOG("Room Data: %d\n"
"Nickname: %s\n" "Nickname: %s\n"
"Address: %s\n" "Address: %s\n"
@ -3405,7 +3408,7 @@ finish:
netplay_room_list[i].gamename, netplay_room_list[i].gamename,
netplay_room_list[i].gamecrc, netplay_room_list[i].gamecrc,
netplay_room_list[i].timestamp); netplay_room_list[i].timestamp);
#endif
j+=8; j+=8;
snprintf(s, sizeof(s), "Nickname: %s", snprintf(s, sizeof(s), "Nickname: %s",

View File

@ -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; netplay_crc_handle_t *state = (netplay_crc_handle_t*)task->state;
task_set_progress(task, 0); 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); task_set_finished(task, false);
if (!state->lpl_list) if (!state->lpl_list)
{ {
task_set_progress(task, 100); 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); task_set_finished(task, true);
free(state); free(state);
return; return;
@ -113,7 +113,7 @@ static void task_netplay_crc_scan_handler(retro_task_t *task)
state->found = true; state->found = true;
task_set_data(task, state); task_set_data(task, state);
task_set_progress(task, 100); 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); task_set_finished(task, true);
string_list_free(state->lpl_list); string_list_free(state->lpl_list);
return; return;
@ -126,7 +126,7 @@ static void task_netplay_crc_scan_handler(retro_task_t *task)
no_playlists: no_playlists:
string_list_free(state->lpl_list); string_list_free(state->lpl_list);
task_set_progress(task, 100); 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); task_set_finished(task, true);
return; return;
} }
@ -161,7 +161,7 @@ bool task_push_netplay_crc_scan(uint32_t crc,
task->state = state; task->state = state;
task->handler = task_netplay_crc_scan_handler; task->handler = task_netplay_crc_scan_handler;
task->callback = netplay_crc_scan_callback; 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); task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);