CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-05 02:58:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Made remote pausing connection-specific

Browse Source
This commit is contained in:
Gregor Richards 2016-12-12 19:50:08 -05:00
parent 6556af1100
commit f6f9905ae3
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
network/netplay/netplay.c
View File

@ -1239,12 +1239,29 @@ static bool netplay_get_cmd(netplay_t *netplay,
} }
case NETPLAY_CMD_PAUSE: case NETPLAY_CMD_PAUSE:
connection->paused = true;
netplay->remote_paused = true; netplay->remote_paused = true;
netplay_send_raw_cmd_all(netplay, connection, NETPLAY_CMD_PAUSE, NULL, 0);
break; break;
case NETPLAY_CMD_RESUME: case NETPLAY_CMD_RESUME:
{
size_t i;
connection->paused = false;
netplay->remote_paused = false; netplay->remote_paused = false;
for (i = 0; i < netplay->connections_size; i++)
{
struct netplay_connection *sc = &netplay->connections[i];
if (sc->active && sc->paused)
{
netplay->remote_paused = true;
break;
}
}
if (!netplay->remote_paused && !netplay->local_paused)
netplay_send_raw_cmd_all(netplay, connection, NETPLAY_CMD_RESUME, NULL, 0);
break; break;
}
default: default:
RARCH_ERR("%s.\n", msg_hash_to_str(MSG_UNKNOWN_NETPLAY_COMMAND_RECEIVED)); RARCH_ERR("%s.\n", msg_hash_to_str(MSG_UNKNOWN_NETPLAY_COMMAND_RECEIVED));
@ -2201,6 +2218,12 @@ void netplay_frontend_paused(netplay_t *netplay, bool paused)
return; return;
netplay->local_paused = paused; netplay->local_paused = paused;
/* If other connections are paused, nothing to say */
if (netplay->remote_paused)
return;
/* Have to send manually because every buffer must be flushed immediately */
for (i = 0; i < netplay->connections_size; i++) for (i = 0; i < netplay->connections_size; i++)
{ {
struct netplay_connection *connection = &netplay->connections[i]; struct netplay_connection *connection = &netplay->connections[i];

3
network/netplay/netplay_private.h
View File

@ -249,6 +249,9 @@ struct netplay_connection
/* Player # of connected player */ /* Player # of connected player */
int player; int player;
/* Is this player paused? */
bool paused;
}; };
struct netplay struct netplay