From b334f04bd55ee6477a273eccda90027112b2d82d Mon Sep 17 00:00:00 2001 From: Gregor Richards Date: Fri, 9 Dec 2016 13:32:04 -0500 Subject: [PATCH] Removing RARCH_ from Netplay stall reasons. --- network/netplay/netplay.c | 8 ++++---- network/netplay/netplay_common.c | 2 +- network/netplay/netplay_net.c | 4 ++-- network/netplay/netplay_private.h | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/network/netplay/netplay.c b/network/netplay/netplay.c index 62d8721485..18010c038f 100644 --- a/network/netplay/netplay.c +++ b/network/netplay/netplay.c @@ -1002,12 +1002,12 @@ static bool netplay_poll(void) /* Consider stalling */ 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) - netplay_data->stall = RARCH_NETPLAY_STALL_NONE; + netplay_data->stall = NETPLAY_STALL_NONE; break; - case RARCH_NETPLAY_STALL_NO_CONNECTION: + case NETPLAY_STALL_NO_CONNECTION: /* We certainly haven't fixed this */ break; @@ -1015,7 +1015,7 @@ static bool netplay_poll(void) if (netplay_data->read_frame_count + netplay_data->delay_frames <= 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(); } } diff --git a/network/netplay/netplay_common.c b/network/netplay/netplay_common.c index 0a2406a037..86ab59ab66 100644 --- a/network/netplay/netplay_common.c +++ b/network/netplay/netplay_common.c @@ -325,7 +325,7 @@ static void netplay_handshake_ready(netplay_t *netplay, struct netplay_connectio } /* 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; connection->mode = NETPLAY_CONNECTION_PLAYING; diff --git a/network/netplay/netplay_net.c b/network/netplay/netplay_net.c index 180dfa00a5..40746cf931 100644 --- a/network/netplay/netplay_net.c +++ b/network/netplay/netplay_net.c @@ -109,7 +109,7 @@ static bool netplay_net_pre_frame(netplay_t *netplay) (netplay->quirks & (NETPLAY_QUIRK_NO_SAVESTATES|NETPLAY_QUIRK_NO_TRANSMISSION)) && (netplay->connections_size == 0 || !netplay->connections[0].active || netplay->connections[0].mode < NETPLAY_CONNECTION_CONNECTED)) - netplay->stall = RARCH_NETPLAY_STALL_NO_CONNECTION; + netplay->stall = NETPLAY_STALL_NO_CONNECTION; } if (netplay->is_server) @@ -221,7 +221,7 @@ process: netplay->can_poll = true; input_poll_net(); - return (netplay->stall != RARCH_NETPLAY_STALL_NO_CONNECTION); + return (netplay->stall != NETPLAY_STALL_NO_CONNECTION); } /** diff --git a/network/netplay/netplay_private.h b/network/netplay/netplay_private.h index 56e66554cc..9a3d05ca6c 100644 --- a/network/netplay/netplay_private.h +++ b/network/netplay/netplay_private.h @@ -179,9 +179,9 @@ enum rarch_netplay_connection_mode enum rarch_netplay_stall_reason { - RARCH_NETPLAY_STALL_NONE = 0, - RARCH_NETPLAY_STALL_RUNNING_FAST, - RARCH_NETPLAY_STALL_NO_CONNECTION + NETPLAY_STALL_NONE = 0, + NETPLAY_STALL_RUNNING_FAST, + NETPLAY_STALL_NO_CONNECTION }; struct delta_frame