mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-11 00:44:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

(netplay_frontend.c) Settings cleanups

Browse Source
This commit is contained in:
twinaphex 2020-03-01 16:24:06 +01:00
parent 29d954bab2
commit 177d2a5903
1 changed files with 59 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
network/netplay/netplay_frontend.c
View File

@ -931,12 +931,13 @@ static void netplay_frontend_paused(netplay_t *netplay, bool paused)
static bool netplay_pre_frame(netplay_t *netplay) static bool netplay_pre_frame(netplay_t *netplay)
{ {
static int reannounce = 0; static int reannounce = 0;
bool sync_stalled = false;
bool sync_stalled = false; settings_t *settings = config_get_ptr();
settings_t *settings = config_get_ptr(); bool netplay_public_announce = settings->bools.netplay_public_announce;
bool netplay_public_announce = settings->bools.netplay_public_announce; bool netplay_use_mitm_server = settings->bools.netplay_use_mitm_server;
bool netplay_use_mitm_server = settings->bools.netplay_use_mitm_server; const char *netplay_password = settings->paths.netplay_password;
const char *netplay_spectate_pw = settings->paths.netplay_spectate_password;
retro_assert(netplay); retro_assert(netplay);
@ -984,8 +985,8 @@ static bool netplay_pre_frame(netplay_t *netplay)
} }
sync_stalled = !netplay_sync_pre_frame(netplay, sync_stalled = !netplay_sync_pre_frame(netplay,
settings->paths.netplay_password, netplay_password,
settings->paths.netplay_spectate_password netplay_spectate_pw
); );
/* If we're disconnected, deinitialize */ /* If we're disconnected, deinitialize */
@ -1318,12 +1319,29 @@ void deinit_netplay(void)
**/ **/
bool init_netplay(void *direct_host, const char *server, unsigned port) bool init_netplay(void *direct_host, const char *server, unsigned port)
{ {
struct retro_callbacks cbs = {0}; struct retro_callbacks cbs = {0};
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
uint64_t serialization_quirks = 0; uint64_t serialization_quirks = 0;
uint64_t quirks = 0; uint64_t quirks = 0;
bool _netplay_is_client = netplay_is_client; bool _netplay_is_client = netplay_is_client;
bool _netplay_enabled = netplay_enabled; bool _netplay_enabled = netplay_enabled;
const char *username = settings->paths.username;
bool netplay_public_announce = settings->bools.netplay_public_announce;
bool netplay_start_as_spectator = settings->bools.netplay_start_as_spectator;
bool netplay_stateless_mode = settings->bools.netplay_stateless_mode;
bool netplay_nat_traversal = settings->bools.netplay_nat_traversal;
bool netplay_use_mitm_server = settings->bools.netplay_use_mitm_server;
const char *netplay_password = settings->paths.netplay_password;
const char *netplay_spectate_pw = settings->paths.netplay_spectate_password;
int netplay_check_frames = settings->ints.netplay_check_frames;
#ifdef HAVE_DISCORD
const char *discord_username = discord_get_own_username();
const char *path_username = discord_username
? discord_username
: username;
#else
const char *path_username = username;
#endif
if (!_netplay_enabled) if (!_netplay_enabled)
return false; return false;
@ -1352,17 +1370,19 @@ bool init_netplay(void *direct_host, const char *server, unsigned port)
if (_netplay_is_client) if (_netplay_is_client)
{ {
RARCH_LOG("[netplay] %s\n", msg_hash_to_str(MSG_CONNECTING_TO_NETPLAY_HOST)); RARCH_LOG("[netplay] %s\n",
msg_hash_to_str(MSG_CONNECTING_TO_NETPLAY_HOST));
} }
else else
{ {
RARCH_LOG("[netplay] %s\n", msg_hash_to_str(MSG_WAITING_FOR_CLIENT)); RARCH_LOG("[netplay] %s\n",
msg_hash_to_str(MSG_WAITING_FOR_CLIENT));
runloop_msg_queue_push( runloop_msg_queue_push(
msg_hash_to_str(MSG_WAITING_FOR_CLIENT), msg_hash_to_str(MSG_WAITING_FOR_CLIENT),
0, 180, false, 0, 180, false,
NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO); NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
if (settings->bools.netplay_public_announce) if (netplay_public_announce)
netplay_announce(); netplay_announce();
} }
@ -1371,23 +1391,22 @@ bool init_netplay(void *direct_host, const char *server, unsigned port)
_netplay_is_client ? (!netplay_client_deferred ? server _netplay_is_client ? (!netplay_client_deferred ? server
: server_address_deferred) : NULL, : server_address_deferred) : NULL,
_netplay_is_client ? (!netplay_client_deferred ? port _netplay_is_client ? (!netplay_client_deferred ? port
: server_port_deferred ) : (port != 0 ? port : RARCH_DEFAULT_PORT), : server_port_deferred )
settings->bools.netplay_stateless_mode, : (port != 0 ? port : RARCH_DEFAULT_PORT),
settings->ints.netplay_check_frames, netplay_stateless_mode,
netplay_check_frames,
&cbs, &cbs,
settings->bools.netplay_nat_traversal netplay_nat_traversal
&& !settings->bools.netplay_use_mitm_server, && !netplay_use_mitm_server,
#ifdef HAVE_DISCORD path_username,
discord_get_own_username() ? discord_get_own_username() : netplay_password,
#endif netplay_spectate_pw,
settings->paths.username,
settings->paths.netplay_password,
settings->paths.netplay_spectate_password,
quirks); quirks);
if (netplay_data) if (netplay_data)
{ {
if (netplay_data->is_server && !settings->bools.netplay_start_as_spectator) if ( netplay_data->is_server &&
!netplay_start_as_spectator)
netplay_toggle_play_spectate(netplay_data); netplay_toggle_play_spectate(netplay_data);
return true; return true;
} }
@ -1401,20 +1420,16 @@ bool init_netplay(void *direct_host, const char *server, unsigned port)
return false; return false;
} }
/** /* Frontend access to Netplay functionality */
* netplay_driver_ctl
*
* Frontend access to Netplay functionality
*/
bool netplay_driver_ctl(enum rarch_netplay_ctl_state state, void *data) bool netplay_driver_ctl(enum rarch_netplay_ctl_state state, void *data)
{ {
/* Used to avoid recursive netplay calls */ /* Used to avoid recursive netplay calls */
static bool in_netplay = false; static bool in_netplay = false;
netplay_t *netplay = netplay_data; netplay_t *netplay = netplay_data;
if (in_netplay) if (in_netplay)
return true; return true;
in_netplay = true; in_netplay = true;
if (!netplay) if (!netplay)
{ {
@ -1430,7 +1445,7 @@ bool netplay_driver_ctl(enum rarch_netplay_ctl_state state, void *data)
netplay_is_client = true; netplay_is_client = true;
break; break;
case RARCH_NETPLAY_CTL_DISABLE: case RARCH_NETPLAY_CTL_DISABLE:
netplay_enabled = false; netplay_enabled = false;
#ifdef HAVE_DISCORD #ifdef HAVE_DISCORD
if (discord_is_inited) if (discord_is_inited)
{ {
@ -1466,13 +1481,13 @@ bool netplay_driver_ctl(enum rarch_netplay_ctl_state state, void *data)
case RARCH_NETPLAY_CTL_IS_ENABLED: case RARCH_NETPLAY_CTL_IS_ENABLED:
break; break;
case RARCH_NETPLAY_CTL_IS_REPLAYING: case RARCH_NETPLAY_CTL_IS_REPLAYING:
in_netplay = false; in_netplay = false;
return netplay->is_replay; return netplay->is_replay;
case RARCH_NETPLAY_CTL_IS_SERVER: case RARCH_NETPLAY_CTL_IS_SERVER:
in_netplay = false; in_netplay = false;
return netplay_enabled && !netplay_is_client; return netplay_enabled && !netplay_is_client;
case RARCH_NETPLAY_CTL_IS_CONNECTED: case RARCH_NETPLAY_CTL_IS_CONNECTED:
in_netplay = false; in_netplay = false;
return netplay->is_connected; return netplay->is_connected;
case RARCH_NETPLAY_CTL_POST_FRAME: case RARCH_NETPLAY_CTL_POST_FRAME:
/* We check if we have new input and replay from recorded input. /* We check if we have new input and replay from recorded input.
@ -1487,7 +1502,7 @@ bool netplay_driver_ctl(enum rarch_netplay_ctl_state state, void *data)
* Returns true if the frontend is cleared to * Returns true if the frontend is cleared to
* render the frame, false if we're stalled or paused * render the frame, false if we're stalled or paused
*/ */
in_netplay = false; in_netplay = false;
return netplay_pre_frame(netplay); return netplay_pre_frame(netplay);
case RARCH_NETPLAY_CTL_GAME_WATCH: case RARCH_NETPLAY_CTL_GAME_WATCH:
netplay_toggle_play_spectate(netplay); netplay_toggle_play_spectate(netplay);
@ -1530,10 +1545,10 @@ bool netplay_driver_ctl(enum rarch_netplay_ctl_state state, void *data)
case RARCH_NETPLAY_CTL_NONE: case RARCH_NETPLAY_CTL_NONE:
case RARCH_NETPLAY_CTL_DISABLE: case RARCH_NETPLAY_CTL_DISABLE:
default: default:
in_netplay = false; in_netplay = false;
return false; return false;
} }
in_netplay = false; in_netplay = false;
return true; return true;
} }