CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-22 18:58:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Slightly changing how catch-up works to avoid spamming the console

Browse Source
This commit is contained in:
Gregor Richards 2016-12-16 10:49:31 -05:00
parent 1141825605
commit db2c8de44c
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
network/netplay/netplay_sync.c
View File

@ -344,8 +344,6 @@ process:
*/ */
void netplay_sync_post_frame(netplay_t *netplay) void netplay_sync_post_frame(netplay_t *netplay)
{ {
int catch_up_ct;
netplay->self_ptr = NEXT_PTR(netplay->self_ptr); netplay->self_ptr = NEXT_PTR(netplay->self_ptr);
netplay->self_frame_count++; netplay->self_frame_count++;
@ -355,7 +353,13 @@ void netplay_sync_post_frame(netplay_t *netplay)
{ {
netplay->other_frame_count = netplay->self_frame_count; netplay->other_frame_count = netplay->self_frame_count;
netplay->other_ptr = netplay->self_ptr; netplay->other_ptr = netplay->self_ptr;
netplay->catch_up = false; /* FIXME: Duplication */
if (netplay->catch_up)
{
netplay->catch_up = false;
input_driver_unset_nonblock_state();
driver_ctl(RARCH_DRIVER_CTL_SET_NONBLOCK_STATE, NULL);
}
return; return;
} }
@ -480,22 +484,27 @@ void netplay_sync_post_frame(netplay_t *netplay)
} }
/* If we're behind, try to catch up */ /* If we're behind, try to catch up */
/* FIXME: Any use in interacting with the real fast forwarding? */
if (netplay->catch_up) if (netplay->catch_up)
catch_up_ct = 0;
else
catch_up_ct = 2;
if (netplay->self_frame_count < netplay->unread_frame_count - catch_up_ct)
{ {
netplay->catch_up = true; /* Are we caught up? */
input_driver_set_nonblock_state(); if (netplay->self_frame_count >= netplay->unread_frame_count)
{
netplay->catch_up = false;
input_driver_unset_nonblock_state();
driver_ctl(RARCH_DRIVER_CTL_SET_NONBLOCK_STATE, NULL);
}
} }
else else
{ {
netplay->catch_up = false; /* Are we falling behind? */
input_driver_unset_nonblock_state(); if (netplay->self_frame_count < netplay->unread_frame_count - 2)
{
netplay->catch_up = true;
input_driver_set_nonblock_state();
driver_ctl(RARCH_DRIVER_CTL_SET_NONBLOCK_STATE, NULL);
}
} }
driver_ctl(RARCH_DRIVER_CTL_SET_NONBLOCK_STATE, NULL);
/* If we're supposed to stall, rewind (we shouldn't get this far if we're /* If we're supposed to stall, rewind (we shouldn't get this far if we're
* stalled, so this is a last resort) */ * stalled, so this is a last resort) */