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

Merge pull request #7929 from fr500/master

Browse Source 
[discord] fix
This commit is contained in:
Twinaphex 2019-01-08 01:14:29 +01:00 committed by GitHub
commit be12b8ff82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
discord/discord.c
View File

@ -155,20 +155,6 @@ static void handle_discord_error(int errcode, const char* message)
RARCH_LOG("[Discord] error (%d: %s)\n", errcode, message); RARCH_LOG("[Discord] error (%d: %s)\n", errcode, message);
} }
#if 0
static int action_ok_push_netplay_refresh_rooms(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
char url [2048] = "http://newlobby.libretro.com/list/";
#ifndef RARCH_CONSOLE
task_push_netplay_lan_scan(netplay_lan_scan_callback);
#endif
task_push_http_transfer(url, true, NULL, netplay_refresh_rooms_cb, NULL);
return 0;
}
#endif
static void handle_discord_join_cb(void *task_data, void *user_data, const char *err) static void handle_discord_join_cb(void *task_data, void *user_data, const char *err)
{ {
struct netplay_room *room; struct netplay_room *room;
@ -187,17 +173,16 @@ static void handle_discord_join_cb(void *task_data, void *user_data, const char
if (room) if (room)
{ {
RARCH_LOG("[Discord] joining lobby at: %s:%d\n",
room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_address : room->address,
room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_port : room->port);
if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_DATA_INITED, NULL)) if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_DATA_INITED, NULL))
deinit_netplay(); deinit_netplay();
netplay_driver_ctl(RARCH_NETPLAY_CTL_ENABLE_CLIENT, NULL); netplay_driver_ctl(RARCH_NETPLAY_CTL_ENABLE_CLIENT, NULL);
snprintf(tmp_hostname, sizeof(tmp_hostname), "%s:%d", snprintf(tmp_hostname, sizeof(tmp_hostname), "%s|%d",
room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_address : room->address, room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_address : room->address,
room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_port : room->port); room->host_method == NETPLAY_HOST_METHOD_MITM ? room->mitm_port : room->port);
RARCH_LOG("[Discord] joining lobby at: %s\n", tmp_hostname);
task_push_netplay_crc_scan(room->gamecrc, task_push_netplay_crc_scan(room->gamecrc,
room->gamename, tmp_hostname, room->corename); room->gamename, tmp_hostname, room->corename);

2
menu/cbs/menu_cbs_ok.c
View File

@ -4343,7 +4343,7 @@ static void netplay_lan_scan_callback(void *task_data,
static int action_ok_push_netplay_refresh_rooms(const char *path, static int action_ok_push_netplay_refresh_rooms(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
char url [2048] = "http://newlobby.libretro.com/list/"; char url [2048] = "http://lobby.libretro.com/list/";
#ifndef RARCH_CONSOLE #ifndef RARCH_CONSOLE
task_push_netplay_lan_scan(netplay_lan_scan_callback); task_push_netplay_lan_scan(netplay_lan_scan_callback);
#endif #endif