ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removing RARCH_ from Netplay stall reasons.

This commit is contained in:
Gregor Richards 2016-12-09 13:32:04 -05:00
parent 1e1abf6951
commit b334f04bd5
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
network/netplay/netplay.c
View File

@ -1002,12 +1002,12 @@ static bool netplay_poll(void)
/* Consider stalling */ /* Consider stalling */
switch (netplay_data->stall) switch (netplay_data->stall)
{ {
case RARCH_NETPLAY_STALL_RUNNING_FAST: case NETPLAY_STALL_RUNNING_FAST:
if (netplay_data->read_frame_count >= netplay_data->self_frame_count) if (netplay_data->read_frame_count >= netplay_data->self_frame_count)
netplay_data->stall = RARCH_NETPLAY_STALL_NONE; netplay_data->stall = NETPLAY_STALL_NONE;
break; break;
case RARCH_NETPLAY_STALL_NO_CONNECTION: case NETPLAY_STALL_NO_CONNECTION:
/* We certainly haven't fixed this */ /* We certainly haven't fixed this */
break; break;
@ -1015,7 +1015,7 @@ static bool netplay_poll(void)
if (netplay_data->read_frame_count + netplay_data->delay_frames if (netplay_data->read_frame_count + netplay_data->delay_frames
<= netplay_data->self_frame_count) <= netplay_data->self_frame_count)
{ {
netplay_data->stall = RARCH_NETPLAY_STALL_RUNNING_FAST; netplay_data->stall = NETPLAY_STALL_RUNNING_FAST;
netplay_data->stall_time = cpu_features_get_time_usec(); netplay_data->stall_time = cpu_features_get_time_usec();
} }
} }

2
network/netplay/netplay_common.c
View File

@ -325,7 +325,7 @@ static void netplay_handshake_ready(netplay_t *netplay, struct netplay_connectio
} }
/* Unstall if we were waiting for this */ /* Unstall if we were waiting for this */
if (netplay->stall == RARCH_NETPLAY_STALL_NO_CONNECTION) if (netplay->stall == NETPLAY_STALL_NO_CONNECTION)
netplay->stall = 0; netplay->stall = 0;
connection->mode = NETPLAY_CONNECTION_PLAYING; connection->mode = NETPLAY_CONNECTION_PLAYING;

4
network/netplay/netplay_net.c
View File

@ -109,7 +109,7 @@ static bool netplay_net_pre_frame(netplay_t *netplay)
(netplay->quirks & (NETPLAY_QUIRK_NO_SAVESTATES|NETPLAY_QUIRK_NO_TRANSMISSION)) && (netplay->quirks & (NETPLAY_QUIRK_NO_SAVESTATES|NETPLAY_QUIRK_NO_TRANSMISSION)) &&
(netplay->connections_size == 0 || !netplay->connections[0].active || (netplay->connections_size == 0 || !netplay->connections[0].active ||
netplay->connections[0].mode < NETPLAY_CONNECTION_CONNECTED)) netplay->connections[0].mode < NETPLAY_CONNECTION_CONNECTED))
netplay->stall = RARCH_NETPLAY_STALL_NO_CONNECTION; netplay->stall = NETPLAY_STALL_NO_CONNECTION;
} }
if (netplay->is_server) if (netplay->is_server)
@ -221,7 +221,7 @@ process:
netplay->can_poll = true; netplay->can_poll = true;
input_poll_net(); input_poll_net();
return (netplay->stall != RARCH_NETPLAY_STALL_NO_CONNECTION); return (netplay->stall != NETPLAY_STALL_NO_CONNECTION);
} }
/** /**

6
network/netplay/netplay_private.h
View File

@ -179,9 +179,9 @@ enum rarch_netplay_connection_mode
enum rarch_netplay_stall_reason enum rarch_netplay_stall_reason
{ {
RARCH_NETPLAY_STALL_NONE = 0, NETPLAY_STALL_NONE = 0,
RARCH_NETPLAY_STALL_RUNNING_FAST, NETPLAY_STALL_RUNNING_FAST,
RARCH_NETPLAY_STALL_NO_CONNECTION NETPLAY_STALL_NO_CONNECTION
}; };
struct delta_frame struct delta_frame