Move discord code to separate file
This commit is contained in:
twinaphex
parent
121174c9af
commit
3ead1ac5df
|
|
@ -2197,6 +2197,8 @@ ifeq ($(HAVE_NETWORKING), 1)
|
||||||
deps/discord-rpc/src/rpc_connection.o \
|
deps/discord-rpc/src/rpc_connection.o \
|
||||||
deps/discord-rpc/src/serialization.o
|
deps/discord-rpc/src/serialization.o
|
||||||
|
|
||||||
|
OBJ += network/discord.o
|
||||||
|
|
||||||
ifneq ($(findstring Win32,$(OS)),)
|
ifneq ($(findstring Win32,$(OS)),)
|
||||||
OBJ += deps/discord-rpc/src/discord_register_win.o \
|
OBJ += deps/discord-rpc/src/discord_register_win.o \
|
||||||
deps/discord-rpc/src/connection_win.o
|
deps/discord-rpc/src/connection_win.o
|
||||||
|
|
|
||||||
|
|
@ -1575,6 +1575,7 @@ XML
|
||||||
HTTP SERVER
|
HTTP SERVER
|
||||||
============================================================ */
|
============================================================ */
|
||||||
#if defined(HAVE_DISCORD)
|
#if defined(HAVE_DISCORD)
|
||||||
|
#include "../network/discord.c"
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
#include "../deps/discord-rpc/src/discord_register_win.c"
|
#include "../deps/discord-rpc/src/discord_register_win.c"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,487 @@
|
||||||
|
/* RetroArch - A frontend for libretro.
|
||||||
|
* Copyright (C) 2011-2021 - Daniel De Matteis
|
||||||
|
* Copyright (C) 2016-2019 - Andr<EFBFBD>s Su<EFBFBD>rez
|
||||||
|
*
|
||||||
|
* RetroArch is free software: you can redistribute it and/or modify it under the terms
|
||||||
|
* of the GNU General Public License as published by the Free Software Found-
|
||||||
|
* ation, either version 3 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
||||||
|
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
|
||||||
|
* PURPOSE. See the GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along with RetroArch.
|
||||||
|
* If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <retro_miscellaneous.h>
|
||||||
|
#include <file/file_path.h>
|
||||||
|
#include <string/stdstring.h>
|
||||||
|
#include <net/net_http.h>
|
||||||
|
#include <features/features_cpu.h>
|
||||||
|
#include <time/rtime.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_CHEEVOS
|
||||||
|
#include "../cheevos/cheevos.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_NETWORKING
|
||||||
|
#include "netplay/netplay.h"
|
||||||
|
#include "netplay/netplay_discovery.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "../paths.h"
|
||||||
|
#include "../file_path_special.h"
|
||||||
|
#include "../tasks/tasks_internal.h"
|
||||||
|
#include "../tasks/task_file_transfer.h"
|
||||||
|
|
||||||
|
#ifdef HAVE_MENU
|
||||||
|
#include "../menu/menu_cbs.h"
|
||||||
|
#include "../menu/menu_driver.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "discord.h"
|
||||||
|
|
||||||
|
#define CDN_URL "https://cdn.discordapp.com/avatars"
|
||||||
|
|
||||||
|
/* Forward declaration */
|
||||||
|
#if defined(__cplusplus) && !defined(CXX_BUILD)
|
||||||
|
extern "C"
|
||||||
|
{
|
||||||
|
#endif
|
||||||
|
void Discord_Register(const char *a, const char *b);
|
||||||
|
#if defined(__cplusplus) && !defined(CXX_BUILD)
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static discord_state_t discord_state_st; /* int64_t alignment */
|
||||||
|
|
||||||
|
discord_state_t *discord_state_get_ptr(void)
|
||||||
|
{
|
||||||
|
return &discord_state_st;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool discord_is_ready(void)
|
||||||
|
{
|
||||||
|
discord_state_t *discord_st = &discord_state_st;
|
||||||
|
return discord_st->ready;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *discord_get_own_username(void)
|
||||||
|
{
|
||||||
|
discord_state_t *discord_st = &discord_state_st;
|
||||||
|
if (discord_st->ready)
|
||||||
|
return discord_st->user_name;
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
char *discord_get_own_avatar(void)
|
||||||
|
{
|
||||||
|
discord_state_t *discord_st = &discord_state_st;
|
||||||
|
if (discord_st->ready)
|
||||||
|
return discord_st->user_avatar;
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool discord_avatar_is_ready(void)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void discord_avatar_set_ready(bool ready)
|
||||||
|
{
|
||||||
|
discord_state_t *discord_st = &discord_state_st;
|
||||||
|
discord_st->avatar_ready = ready;
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_MENU
|
||||||
|
static bool discord_download_avatar(
|
||||||
|
discord_state_t *discord_st,
|
||||||
|
const char* user_id, const char* avatar_id)
|
||||||
|
{
|
||||||
|
static char url[PATH_MAX_LENGTH];
|
||||||
|
static char url_encoded[PATH_MAX_LENGTH];
|
||||||
|
static char full_path[PATH_MAX_LENGTH];
|
||||||
|
static char buf[PATH_MAX_LENGTH];
|
||||||
|
file_transfer_t *transf = NULL;
|
||||||
|
|
||||||
|
fill_pathname_application_special(buf,
|
||||||
|
sizeof(buf),
|
||||||
|
APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_DISCORD_AVATARS);
|
||||||
|
fill_pathname_join(full_path, buf, avatar_id, sizeof(full_path));
|
||||||
|
strlcpy(discord_st->user_avatar,
|
||||||
|
avatar_id, sizeof(discord_st->user_avatar));
|
||||||
|
|
||||||
|
if (path_is_valid(full_path))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
if (string_is_empty(avatar_id))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
snprintf(url, sizeof(url), "%s/%s/%s" FILE_PATH_PNG_EXTENSION, CDN_URL, user_id, avatar_id);
|
||||||
|
net_http_urlencode_full(url_encoded, url, sizeof(url_encoded));
|
||||||
|
snprintf(buf, sizeof(buf), "%s" FILE_PATH_PNG_EXTENSION, avatar_id);
|
||||||
|
|
||||||
|
transf = (file_transfer_t*)malloc(sizeof(*transf));
|
||||||
|
|
||||||
|
transf->enum_idx = MENU_ENUM_LABEL_CB_DISCORD_AVATAR;
|
||||||
|
strlcpy(transf->path, buf, sizeof(transf->path));
|
||||||
|
transf->user_data = NULL;
|
||||||
|
|
||||||
|
task_push_http_transfer_file(url_encoded, true, NULL, cb_generic_download, transf);
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static void handle_discord_ready(const DiscordUser* connectedUser)
|
||||||
|
{
|
||||||
|
discord_state_t *discord_st = &discord_state_st;
|
||||||
|
strlcpy(discord_st->user_name,
|
||||||
|
connectedUser->username, sizeof(discord_st->user_name));
|
||||||
|
|
||||||
|
#ifdef HAVE_MENU
|
||||||
|
discord_download_avatar(discord_st,
|
||||||
|
connectedUser->userId, connectedUser->avatar);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handle_discord_disconnected(int errcode, const char* message)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handle_discord_error(int errcode, const char* message)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handle_discord_join_cb(retro_task_t *task,
|
||||||
|
void *task_data, void *user_data, const char *err)
|
||||||
|
{
|
||||||
|
char join_hostname[PATH_MAX_LENGTH];
|
||||||
|
struct netplay_room *room = NULL;
|
||||||
|
http_transfer_data_t *data = (http_transfer_data_t*)task_data;
|
||||||
|
discord_state_t *discord_st = &discord_state_st;
|
||||||
|
|
||||||
|
if (!data || err || !data->data)
|
||||||
|
goto finish;
|
||||||
|
|
||||||
|
data->data = (char*)realloc(data->data, data->len + 1);
|
||||||
|
data->data[data->len] = '\0';
|
||||||
|
|
||||||
|
netplay_rooms_parse(data->data);
|
||||||
|
room = netplay_room_get(0);
|
||||||
|
|
||||||
|
if (room)
|
||||||
|
{
|
||||||
|
bool host_method_is_mitm = room->host_method == NETPLAY_HOST_METHOD_MITM;
|
||||||
|
const char *srv_address = host_method_is_mitm ? room->mitm_address : room->address;
|
||||||
|
unsigned srv_port = host_method_is_mitm ? room->mitm_port : room->port;
|
||||||
|
|
||||||
|
if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_DATA_INITED, NULL))
|
||||||
|
deinit_netplay();
|
||||||
|
netplay_driver_ctl(RARCH_NETPLAY_CTL_ENABLE_CLIENT, NULL);
|
||||||
|
|
||||||
|
snprintf(join_hostname, sizeof(join_hostname), "%s|%d",
|
||||||
|
srv_address, srv_port);
|
||||||
|
|
||||||
|
task_push_netplay_crc_scan(room->gamecrc,
|
||||||
|
room->gamename, join_hostname, room->corename, room->subsystem_name);
|
||||||
|
discord_st->connecting = true;
|
||||||
|
if (discord_st->ready)
|
||||||
|
discord_update(DISCORD_PRESENCE_NETPLAY_CLIENT);
|
||||||
|
}
|
||||||
|
|
||||||
|
finish:
|
||||||
|
if (user_data)
|
||||||
|
free(user_data);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handle_discord_join(const char* secret)
|
||||||
|
{
|
||||||
|
char url[2048];
|
||||||
|
struct string_list *list = string_split(secret, "|");
|
||||||
|
discord_state_t *discord_st = &discord_state_st;
|
||||||
|
|
||||||
|
strlcpy(discord_st->peer_party_id,
|
||||||
|
list->elems[0].data, sizeof(discord_st->peer_party_id));
|
||||||
|
snprintf(url, sizeof(url), FILE_PATH_LOBBY_LIBRETRO_URL "%s/",
|
||||||
|
discord_st->peer_party_id);
|
||||||
|
|
||||||
|
task_push_http_transfer(url, true, NULL, handle_discord_join_cb, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void handle_discord_spectate(const char* secret)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_MENU
|
||||||
|
#if 0
|
||||||
|
static void handle_discord_join_response(void *ignore, const char *line)
|
||||||
|
{
|
||||||
|
/* TODO/FIXME: needs in-game widgets */
|
||||||
|
if (strstr(line, "yes"))
|
||||||
|
Discord_Respond(user_id, DISCORD_REPLY_YES);
|
||||||
|
|
||||||
|
#ifdef HAVE_MENU
|
||||||
|
menu_input_dialog_end();
|
||||||
|
retroarch_menu_running_finished(false);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static void handle_discord_join_request(const DiscordUser* request)
|
||||||
|
{
|
||||||
|
#ifdef HAVE_MENU
|
||||||
|
#if 0
|
||||||
|
char buf[PATH_MAX_LENGTH];
|
||||||
|
menu_input_ctx_line_t line;
|
||||||
|
#endif
|
||||||
|
discord_state_t *discord_st = &discord_state_st;
|
||||||
|
discord_download_avatar(discord_st, request->userId, request->avatar);
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
/* TODO/FIXME: Needs in-game widgets */
|
||||||
|
retroarch_menu_running();
|
||||||
|
|
||||||
|
memset(&line, 0, sizeof(line));
|
||||||
|
snprintf(buf, sizeof(buf), "%s %s?",
|
||||||
|
msg_hash_to_str(MSG_DISCORD_CONNECTION_REQUEST), request->username);
|
||||||
|
line.label = buf;
|
||||||
|
line.label_setting = "no_setting";
|
||||||
|
line.cb = handle_discord_join_response;
|
||||||
|
|
||||||
|
/* TODO/FIXME: needs in-game widgets
|
||||||
|
* TODO/FIXME: bespoke dialog, should show while in-game
|
||||||
|
* and have a hotkey to accept
|
||||||
|
* TODO/FIXME: show avatar of the user connecting
|
||||||
|
*/
|
||||||
|
if (!menu_input_dialog_start(&line))
|
||||||
|
return;
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void discord_update(enum discord_presence presence)
|
||||||
|
{
|
||||||
|
discord_state_t *discord_st = &discord_state_st;
|
||||||
|
#ifdef HAVE_CHEEVOS
|
||||||
|
char cheevos_richpresence[256];
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (presence == discord_st->status)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!discord_st->connecting
|
||||||
|
&&
|
||||||
|
( presence == DISCORD_PRESENCE_NONE
|
||||||
|
|| presence == DISCORD_PRESENCE_MENU))
|
||||||
|
{
|
||||||
|
memset(&discord_st->presence,
|
||||||
|
0, sizeof(discord_st->presence));
|
||||||
|
discord_st->peer_party_id[0] = '\0';
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (presence)
|
||||||
|
{
|
||||||
|
case DISCORD_PRESENCE_MENU:
|
||||||
|
discord_st->presence.details = msg_hash_to_str(
|
||||||
|
MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU);
|
||||||
|
discord_st->presence.largeImageKey = "base";
|
||||||
|
discord_st->presence.largeImageText = msg_hash_to_str(
|
||||||
|
MENU_ENUM_LABEL_VALUE_NO_CORE);
|
||||||
|
discord_st->presence.instance = 0;
|
||||||
|
break;
|
||||||
|
case DISCORD_PRESENCE_GAME_PAUSED:
|
||||||
|
discord_st->presence.smallImageKey = "paused";
|
||||||
|
discord_st->presence.smallImageText = msg_hash_to_str(
|
||||||
|
MENU_ENUM_LABEL_VALUE_DISCORD_STATUS_PAUSED);
|
||||||
|
discord_st->presence.details = msg_hash_to_str(
|
||||||
|
MENU_ENUM_LABEL_VALUE_DISCORD_IN_GAME_PAUSED);
|
||||||
|
discord_st->pause_time = time(0);
|
||||||
|
discord_st->elapsed_time = difftime(discord_st->pause_time,
|
||||||
|
discord_st->start_time);
|
||||||
|
discord_st->presence.startTimestamp = discord_st->pause_time;
|
||||||
|
break;
|
||||||
|
case DISCORD_PRESENCE_GAME:
|
||||||
|
{
|
||||||
|
core_info_t *core_info = NULL;
|
||||||
|
core_info_get_current_core(&core_info);
|
||||||
|
|
||||||
|
if (core_info)
|
||||||
|
{
|
||||||
|
const char *system_id =
|
||||||
|
core_info->system_id
|
||||||
|
? core_info->system_id
|
||||||
|
: "core";
|
||||||
|
const char *label = NULL;
|
||||||
|
const struct playlist_entry *entry = NULL;
|
||||||
|
playlist_t *current_playlist = playlist_get_cached();
|
||||||
|
|
||||||
|
if (current_playlist)
|
||||||
|
{
|
||||||
|
playlist_get_index_by_path(
|
||||||
|
current_playlist,
|
||||||
|
path_get(RARCH_PATH_CONTENT),
|
||||||
|
&entry);
|
||||||
|
|
||||||
|
if (entry && !string_is_empty(entry->label))
|
||||||
|
label = entry->label;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!label)
|
||||||
|
label = path_basename(path_get(RARCH_PATH_BASENAME));
|
||||||
|
discord_st->presence.largeImageKey = system_id;
|
||||||
|
|
||||||
|
if (core_info->display_name)
|
||||||
|
discord_st->presence.largeImageText =
|
||||||
|
core_info->display_name;
|
||||||
|
|
||||||
|
discord_st->start_time = time(0);
|
||||||
|
if (discord_st->pause_time != 0)
|
||||||
|
discord_st->start_time = time(0) -
|
||||||
|
discord_st->elapsed_time;
|
||||||
|
|
||||||
|
discord_st->pause_time = 0;
|
||||||
|
discord_st->elapsed_time = 0;
|
||||||
|
|
||||||
|
discord_st->presence.smallImageKey = "playing";
|
||||||
|
discord_st->presence.smallImageText = msg_hash_to_str(
|
||||||
|
MENU_ENUM_LABEL_VALUE_DISCORD_STATUS_PLAYING);
|
||||||
|
discord_st->presence.startTimestamp = discord_st->start_time;
|
||||||
|
|
||||||
|
#ifdef HAVE_CHEEVOS
|
||||||
|
if (rcheevos_get_richpresence(cheevos_richpresence, sizeof(cheevos_richpresence)) > 0)
|
||||||
|
discord_st->presence.details = cheevos_richpresence;
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
discord_st->presence.details = msg_hash_to_str(
|
||||||
|
MENU_ENUM_LABEL_VALUE_DISCORD_IN_GAME);
|
||||||
|
|
||||||
|
discord_st->presence.state = label;
|
||||||
|
discord_st->presence.instance = 0;
|
||||||
|
|
||||||
|
if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL))
|
||||||
|
{
|
||||||
|
discord_st->peer_party_id[0] = '\0';
|
||||||
|
discord_st->connecting = false;
|
||||||
|
discord_st->presence.partyId = NULL;
|
||||||
|
discord_st->presence.partyMax = 0;
|
||||||
|
discord_st->presence.partySize = 0;
|
||||||
|
discord_st->presence.joinSecret = (const char*)'\0';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case DISCORD_PRESENCE_NETPLAY_HOSTING:
|
||||||
|
{
|
||||||
|
char join_secret[128];
|
||||||
|
struct netplay_room *room = &networking_state_get_ptr()->host_room;
|
||||||
|
bool host_method_is_mitm = room->host_method == NETPLAY_HOST_METHOD_MITM;
|
||||||
|
const char *srv_address = host_method_is_mitm ? room->mitm_address : room->address;
|
||||||
|
unsigned srv_port = host_method_is_mitm ? room->mitm_port : room->port;
|
||||||
|
if (room->id == 0)
|
||||||
|
return;
|
||||||
|
|
||||||
|
snprintf(discord_st->self_party_id,
|
||||||
|
sizeof(discord_st->self_party_id), "%d", room->id);
|
||||||
|
snprintf(join_secret,
|
||||||
|
sizeof(join_secret), "%d|%" PRId64,
|
||||||
|
room->id, cpu_features_get_time_usec());
|
||||||
|
|
||||||
|
discord_st->presence.joinSecret = strdup(join_secret);
|
||||||
|
#if 0
|
||||||
|
discord_st->presence.spectateSecret = "SPECSPECSPEC";
|
||||||
|
#endif
|
||||||
|
discord_st->presence.partyId = strdup(discord_st->self_party_id);
|
||||||
|
discord_st->presence.partyMax = 2;
|
||||||
|
discord_st->presence.partySize = 1;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case DISCORD_PRESENCE_NETPLAY_CLIENT:
|
||||||
|
discord_st->presence.partyId = strdup(discord_st->peer_party_id);
|
||||||
|
break;
|
||||||
|
case DISCORD_PRESENCE_NETPLAY_NETPLAY_STOPPED:
|
||||||
|
{
|
||||||
|
if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL) &&
|
||||||
|
!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_CONNECTED, NULL))
|
||||||
|
{
|
||||||
|
discord_st->peer_party_id[0] = '\0';
|
||||||
|
discord_st->connecting = false;
|
||||||
|
discord_st->presence.partyId = NULL;
|
||||||
|
discord_st->presence.partyMax = 0;
|
||||||
|
discord_st->presence.partySize = 0;
|
||||||
|
discord_st->presence.joinSecret = (const char*)'\0';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
#ifdef HAVE_CHEEVOS
|
||||||
|
case DISCORD_PRESENCE_RETROACHIEVEMENTS:
|
||||||
|
if (discord_st->pause_time)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (rcheevos_get_richpresence(cheevos_richpresence, sizeof(cheevos_richpresence)) > 0)
|
||||||
|
discord_st->presence.details = cheevos_richpresence;
|
||||||
|
presence = DISCORD_PRESENCE_GAME;
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
case DISCORD_PRESENCE_SHUTDOWN:
|
||||||
|
discord_st->presence.partyId = NULL;
|
||||||
|
discord_st->presence.partyMax = 0;
|
||||||
|
discord_st->presence.partySize = 0;
|
||||||
|
discord_st->presence.joinSecret = (const char*)'\0';
|
||||||
|
discord_st->connecting = false;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
Discord_UpdatePresence(&discord_st->presence);
|
||||||
|
#ifdef DISCORD_DISABLE_IO_THREAD
|
||||||
|
Discord_UpdateConnection();
|
||||||
|
#endif
|
||||||
|
discord_st->status = presence;
|
||||||
|
}
|
||||||
|
|
||||||
|
void discord_init(const char *discord_app_id, char *args)
|
||||||
|
{
|
||||||
|
DiscordEventHandlers handlers;
|
||||||
|
#ifdef _WIN32
|
||||||
|
char full_path[PATH_MAX_LENGTH];
|
||||||
|
#endif
|
||||||
|
char command[PATH_MAX_LENGTH];
|
||||||
|
discord_state_t *discord_st = &discord_state_st;
|
||||||
|
|
||||||
|
discord_st->start_time = time(0);
|
||||||
|
|
||||||
|
handlers.ready = handle_discord_ready;
|
||||||
|
handlers.disconnected = handle_discord_disconnected;
|
||||||
|
handlers.errored = handle_discord_error;
|
||||||
|
handlers.joinGame = handle_discord_join;
|
||||||
|
handlers.spectateGame = handle_discord_spectate;
|
||||||
|
handlers.joinRequest = handle_discord_join_request;
|
||||||
|
|
||||||
|
Discord_Initialize(discord_app_id, &handlers, 0, NULL);
|
||||||
|
#ifdef DISCORD_DISABLE_IO_THREAD
|
||||||
|
Discord_UpdateConnection();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
fill_pathname_application_path(full_path, sizeof(full_path));
|
||||||
|
if (strstr(args, full_path))
|
||||||
|
strlcpy(command, args, sizeof(command));
|
||||||
|
else
|
||||||
|
{
|
||||||
|
path_basedir(full_path);
|
||||||
|
strlcpy(command, full_path, sizeof(command));
|
||||||
|
strlcat(command, args, sizeof(command));
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
strcpy_literal(command, "sh -c ");
|
||||||
|
strlcat(command, args, sizeof(command));
|
||||||
|
#endif
|
||||||
|
Discord_Register(discord_app_id, command);
|
||||||
|
#ifdef DISCORD_DISABLE_IO_THREAD
|
||||||
|
Discord_UpdateConnection();
|
||||||
|
#endif
|
||||||
|
discord_st->ready = true;
|
||||||
|
}
|
||||||
475
retroarch.c
475
retroarch.c
|
|
@ -4,7 +4,7 @@
|
||||||
* Copyright (C) 2012-2015 - Michael Lelli
|
* Copyright (C) 2012-2015 - Michael Lelli
|
||||||
* Copyright (C) 2014-2017 - Jean-Andr<EFBFBD> Santoni
|
* Copyright (C) 2014-2017 - Jean-Andr<EFBFBD> Santoni
|
||||||
* Copyright (C) 2016-2019 - Brad Parker
|
* Copyright (C) 2016-2019 - Brad Parker
|
||||||
* Copyright (C) 2016-2019 - Andr<EFBFBD>s Su<EFBFBD>rez (input mapper/Discord code)
|
* Copyright (C) 2016-2019 - Andr<EFBFBD>s Su<EFBFBD>rez (input mapper code)
|
||||||
* Copyright (C) 2016-2017 - Gregor Richards (network code)
|
* Copyright (C) 2016-2017 - Gregor Richards (network code)
|
||||||
*
|
*
|
||||||
* RetroArch is free software: you can redistribute it and/or modify it under the terms
|
* RetroArch is free software: you can redistribute it and/or modify it under the terms
|
||||||
|
|
@ -1230,463 +1230,6 @@ static const void *find_driver_nonempty(
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_DISCORD
|
|
||||||
#define CDN_URL "https://cdn.discordapp.com/avatars"
|
|
||||||
|
|
||||||
static discord_state_t discord_state_st; /* int64_t alignment */
|
|
||||||
|
|
||||||
discord_state_t *discord_state_get_ptr(void)
|
|
||||||
{
|
|
||||||
return &discord_state_st;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool discord_is_ready(void)
|
|
||||||
{
|
|
||||||
discord_state_t *discord_st = &discord_state_st;
|
|
||||||
return discord_st->ready;
|
|
||||||
}
|
|
||||||
|
|
||||||
char *discord_get_own_username(void)
|
|
||||||
{
|
|
||||||
discord_state_t *discord_st = &discord_state_st;
|
|
||||||
if (discord_st->ready)
|
|
||||||
return discord_st->user_name;
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
char *discord_get_own_avatar(void)
|
|
||||||
{
|
|
||||||
discord_state_t *discord_st = &discord_state_st;
|
|
||||||
if (discord_st->ready)
|
|
||||||
return discord_st->user_avatar;
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool discord_avatar_is_ready(void)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
void discord_avatar_set_ready(bool ready)
|
|
||||||
{
|
|
||||||
discord_state_t *discord_st = &discord_state_st;
|
|
||||||
discord_st->avatar_ready = ready;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef HAVE_MENU
|
|
||||||
static bool discord_download_avatar(
|
|
||||||
discord_state_t *discord_st,
|
|
||||||
const char* user_id, const char* avatar_id)
|
|
||||||
{
|
|
||||||
static char url[PATH_MAX_LENGTH];
|
|
||||||
static char url_encoded[PATH_MAX_LENGTH];
|
|
||||||
static char full_path[PATH_MAX_LENGTH];
|
|
||||||
static char buf[PATH_MAX_LENGTH];
|
|
||||||
file_transfer_t *transf = NULL;
|
|
||||||
|
|
||||||
fill_pathname_application_special(buf,
|
|
||||||
sizeof(buf),
|
|
||||||
APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_DISCORD_AVATARS);
|
|
||||||
fill_pathname_join(full_path, buf, avatar_id, sizeof(full_path));
|
|
||||||
strlcpy(discord_st->user_avatar,
|
|
||||||
avatar_id, sizeof(discord_st->user_avatar));
|
|
||||||
|
|
||||||
if (path_is_valid(full_path))
|
|
||||||
return true;
|
|
||||||
|
|
||||||
if (string_is_empty(avatar_id))
|
|
||||||
return false;
|
|
||||||
|
|
||||||
snprintf(url, sizeof(url), "%s/%s/%s" FILE_PATH_PNG_EXTENSION, CDN_URL, user_id, avatar_id);
|
|
||||||
net_http_urlencode_full(url_encoded, url, sizeof(url_encoded));
|
|
||||||
snprintf(buf, sizeof(buf), "%s" FILE_PATH_PNG_EXTENSION, avatar_id);
|
|
||||||
|
|
||||||
transf = (file_transfer_t*)malloc(sizeof(*transf));
|
|
||||||
|
|
||||||
transf->enum_idx = MENU_ENUM_LABEL_CB_DISCORD_AVATAR;
|
|
||||||
strlcpy(transf->path, buf, sizeof(transf->path));
|
|
||||||
transf->user_data = NULL;
|
|
||||||
|
|
||||||
task_push_http_transfer_file(url_encoded, true, NULL, cb_generic_download, transf);
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static void handle_discord_ready(const DiscordUser* connectedUser)
|
|
||||||
{
|
|
||||||
discord_state_t *discord_st = &discord_state_st;
|
|
||||||
strlcpy(discord_st->user_name,
|
|
||||||
connectedUser->username, sizeof(discord_st->user_name));
|
|
||||||
|
|
||||||
#ifdef HAVE_MENU
|
|
||||||
discord_download_avatar(discord_st,
|
|
||||||
connectedUser->userId, connectedUser->avatar);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
static void handle_discord_disconnected(int errcode, const char* message)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static void handle_discord_error(int errcode, const char* message)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
static void handle_discord_join_cb(retro_task_t *task,
|
|
||||||
void *task_data, void *user_data, const char *err)
|
|
||||||
{
|
|
||||||
char join_hostname[PATH_MAX_LENGTH];
|
|
||||||
struct netplay_room *room = NULL;
|
|
||||||
http_transfer_data_t *data = (http_transfer_data_t*)task_data;
|
|
||||||
discord_state_t *discord_st = &discord_state_st;
|
|
||||||
|
|
||||||
if (!data || err || !data->data)
|
|
||||||
goto finish;
|
|
||||||
|
|
||||||
data->data = (char*)realloc(data->data, data->len + 1);
|
|
||||||
data->data[data->len] = '\0';
|
|
||||||
|
|
||||||
netplay_rooms_parse(data->data);
|
|
||||||
room = netplay_room_get(0);
|
|
||||||
|
|
||||||
if (room)
|
|
||||||
{
|
|
||||||
bool host_method_is_mitm = room->host_method == NETPLAY_HOST_METHOD_MITM;
|
|
||||||
const char *srv_address = host_method_is_mitm ? room->mitm_address : room->address;
|
|
||||||
unsigned srv_port = host_method_is_mitm ? room->mitm_port : room->port;
|
|
||||||
|
|
||||||
if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_DATA_INITED, NULL))
|
|
||||||
deinit_netplay();
|
|
||||||
netplay_driver_ctl(RARCH_NETPLAY_CTL_ENABLE_CLIENT, NULL);
|
|
||||||
|
|
||||||
snprintf(join_hostname, sizeof(join_hostname), "%s|%d",
|
|
||||||
srv_address, srv_port);
|
|
||||||
|
|
||||||
task_push_netplay_crc_scan(room->gamecrc,
|
|
||||||
room->gamename, join_hostname, room->corename, room->subsystem_name);
|
|
||||||
discord_st->connecting = true;
|
|
||||||
if (discord_st->ready)
|
|
||||||
discord_update(DISCORD_PRESENCE_NETPLAY_CLIENT);
|
|
||||||
}
|
|
||||||
|
|
||||||
finish:
|
|
||||||
|
|
||||||
if (err)
|
|
||||||
RARCH_ERR("%s: %s\n", msg_hash_to_str(MSG_DOWNLOAD_FAILED), err);
|
|
||||||
|
|
||||||
if (user_data)
|
|
||||||
free(user_data);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void handle_discord_join(const char* secret)
|
|
||||||
{
|
|
||||||
char url[2048];
|
|
||||||
struct string_list *list = string_split(secret, "|");
|
|
||||||
discord_state_t *discord_st = &discord_state_st;
|
|
||||||
|
|
||||||
strlcpy(discord_st->peer_party_id,
|
|
||||||
list->elems[0].data, sizeof(discord_st->peer_party_id));
|
|
||||||
snprintf(url, sizeof(url), FILE_PATH_LOBBY_LIBRETRO_URL "%s/",
|
|
||||||
discord_st->peer_party_id);
|
|
||||||
|
|
||||||
task_push_http_transfer(url, true, NULL, handle_discord_join_cb, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void handle_discord_spectate(const char* secret)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef HAVE_MENU
|
|
||||||
#if 0
|
|
||||||
static void handle_discord_join_response(void *ignore, const char *line)
|
|
||||||
{
|
|
||||||
/* TODO/FIXME: needs in-game widgets */
|
|
||||||
if (strstr(line, "yes"))
|
|
||||||
Discord_Respond(user_id, DISCORD_REPLY_YES);
|
|
||||||
|
|
||||||
#ifdef HAVE_MENU
|
|
||||||
menu_input_dialog_end();
|
|
||||||
retroarch_menu_running_finished(false);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static void handle_discord_join_request(const DiscordUser* request)
|
|
||||||
{
|
|
||||||
#ifdef HAVE_MENU
|
|
||||||
#if 0
|
|
||||||
char buf[PATH_MAX_LENGTH];
|
|
||||||
menu_input_ctx_line_t line;
|
|
||||||
#endif
|
|
||||||
discord_state_t *discord_st = &discord_state_st;
|
|
||||||
|
|
||||||
RARCH_LOG("[DISCORD]: Join request from %s#%s - %s %s\n",
|
|
||||||
request->username,
|
|
||||||
request->discriminator,
|
|
||||||
request->userId,
|
|
||||||
request->avatar);
|
|
||||||
|
|
||||||
discord_download_avatar(discord_st, request->userId, request->avatar);
|
|
||||||
|
|
||||||
#if 0
|
|
||||||
/* TODO/FIXME: Needs in-game widgets */
|
|
||||||
retroarch_menu_running();
|
|
||||||
|
|
||||||
memset(&line, 0, sizeof(line));
|
|
||||||
snprintf(buf, sizeof(buf), "%s %s?",
|
|
||||||
msg_hash_to_str(MSG_DISCORD_CONNECTION_REQUEST), request->username);
|
|
||||||
line.label = buf;
|
|
||||||
line.label_setting = "no_setting";
|
|
||||||
line.cb = handle_discord_join_response;
|
|
||||||
|
|
||||||
/* TODO/FIXME: needs in-game widgets
|
|
||||||
* TODO/FIXME: bespoke dialog, should show while in-game
|
|
||||||
* and have a hotkey to accept
|
|
||||||
* TODO/FIXME: show avatar of the user connecting
|
|
||||||
*/
|
|
||||||
if (!menu_input_dialog_start(&line))
|
|
||||||
return;
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void discord_update(enum discord_presence presence)
|
|
||||||
{
|
|
||||||
discord_state_t *discord_st = &discord_state_st;
|
|
||||||
#ifdef HAVE_CHEEVOS
|
|
||||||
char cheevos_richpresence[256];
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (presence == discord_st->status)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (!discord_st->connecting
|
|
||||||
&&
|
|
||||||
( presence == DISCORD_PRESENCE_NONE
|
|
||||||
|| presence == DISCORD_PRESENCE_MENU))
|
|
||||||
{
|
|
||||||
memset(&discord_st->presence,
|
|
||||||
0, sizeof(discord_st->presence));
|
|
||||||
discord_st->peer_party_id[0] = '\0';
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (presence)
|
|
||||||
{
|
|
||||||
case DISCORD_PRESENCE_MENU:
|
|
||||||
discord_st->presence.details = msg_hash_to_str(
|
|
||||||
MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU);
|
|
||||||
discord_st->presence.largeImageKey = "base";
|
|
||||||
discord_st->presence.largeImageText = msg_hash_to_str(
|
|
||||||
MENU_ENUM_LABEL_VALUE_NO_CORE);
|
|
||||||
discord_st->presence.instance = 0;
|
|
||||||
break;
|
|
||||||
case DISCORD_PRESENCE_GAME_PAUSED:
|
|
||||||
discord_st->presence.smallImageKey = "paused";
|
|
||||||
discord_st->presence.smallImageText = msg_hash_to_str(
|
|
||||||
MENU_ENUM_LABEL_VALUE_DISCORD_STATUS_PAUSED);
|
|
||||||
discord_st->presence.details = msg_hash_to_str(
|
|
||||||
MENU_ENUM_LABEL_VALUE_DISCORD_IN_GAME_PAUSED);
|
|
||||||
discord_st->pause_time = time(0);
|
|
||||||
discord_st->elapsed_time = difftime(discord_st->pause_time,
|
|
||||||
discord_st->start_time);
|
|
||||||
discord_st->presence.startTimestamp = discord_st->pause_time;
|
|
||||||
break;
|
|
||||||
case DISCORD_PRESENCE_GAME:
|
|
||||||
{
|
|
||||||
core_info_t *core_info = NULL;
|
|
||||||
core_info_get_current_core(&core_info);
|
|
||||||
|
|
||||||
if (core_info)
|
|
||||||
{
|
|
||||||
const char *system_id =
|
|
||||||
core_info->system_id
|
|
||||||
? core_info->system_id
|
|
||||||
: "core";
|
|
||||||
const char *label = NULL;
|
|
||||||
const struct playlist_entry *entry = NULL;
|
|
||||||
playlist_t *current_playlist = playlist_get_cached();
|
|
||||||
|
|
||||||
if (current_playlist)
|
|
||||||
{
|
|
||||||
playlist_get_index_by_path(
|
|
||||||
current_playlist,
|
|
||||||
path_get(RARCH_PATH_CONTENT),
|
|
||||||
&entry);
|
|
||||||
|
|
||||||
if (entry && !string_is_empty(entry->label))
|
|
||||||
label = entry->label;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!label)
|
|
||||||
label = path_basename(path_get(RARCH_PATH_BASENAME));
|
|
||||||
discord_st->presence.largeImageKey = system_id;
|
|
||||||
|
|
||||||
if (core_info->display_name)
|
|
||||||
discord_st->presence.largeImageText =
|
|
||||||
core_info->display_name;
|
|
||||||
|
|
||||||
discord_st->start_time = time(0);
|
|
||||||
if (discord_st->pause_time != 0)
|
|
||||||
discord_st->start_time = time(0) -
|
|
||||||
discord_st->elapsed_time;
|
|
||||||
|
|
||||||
discord_st->pause_time = 0;
|
|
||||||
discord_st->elapsed_time = 0;
|
|
||||||
|
|
||||||
discord_st->presence.smallImageKey = "playing";
|
|
||||||
discord_st->presence.smallImageText = msg_hash_to_str(
|
|
||||||
MENU_ENUM_LABEL_VALUE_DISCORD_STATUS_PLAYING);
|
|
||||||
discord_st->presence.startTimestamp = discord_st->start_time;
|
|
||||||
|
|
||||||
#ifdef HAVE_CHEEVOS
|
|
||||||
if (rcheevos_get_richpresence(cheevos_richpresence, sizeof(cheevos_richpresence)) > 0)
|
|
||||||
discord_st->presence.details = cheevos_richpresence;
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
discord_st->presence.details = msg_hash_to_str(
|
|
||||||
MENU_ENUM_LABEL_VALUE_DISCORD_IN_GAME);
|
|
||||||
|
|
||||||
discord_st->presence.state = label;
|
|
||||||
discord_st->presence.instance = 0;
|
|
||||||
|
|
||||||
if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL))
|
|
||||||
{
|
|
||||||
discord_st->peer_party_id[0] = '\0';
|
|
||||||
discord_st->connecting = false;
|
|
||||||
discord_st->presence.partyId = NULL;
|
|
||||||
discord_st->presence.partyMax = 0;
|
|
||||||
discord_st->presence.partySize = 0;
|
|
||||||
discord_st->presence.joinSecret = (const char*)'\0';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case DISCORD_PRESENCE_NETPLAY_HOSTING:
|
|
||||||
{
|
|
||||||
char join_secret[128];
|
|
||||||
struct netplay_room *room = &networking_state_get_ptr()->host_room;
|
|
||||||
bool host_method_is_mitm = room->host_method == NETPLAY_HOST_METHOD_MITM;
|
|
||||||
const char *srv_address = host_method_is_mitm ? room->mitm_address : room->address;
|
|
||||||
unsigned srv_port = host_method_is_mitm ? room->mitm_port : room->port;
|
|
||||||
if (room->id == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
RARCH_LOG("[DISCORD]: Netplay room details: ID=%d"
|
|
||||||
", Nick=%s IP=%s Port=%d\n",
|
|
||||||
room->id, room->nickname,
|
|
||||||
srv_address, srv_port);
|
|
||||||
|
|
||||||
snprintf(discord_st->self_party_id,
|
|
||||||
sizeof(discord_st->self_party_id), "%d", room->id);
|
|
||||||
snprintf(join_secret,
|
|
||||||
sizeof(join_secret), "%d|%" PRId64,
|
|
||||||
room->id, cpu_features_get_time_usec());
|
|
||||||
|
|
||||||
discord_st->presence.joinSecret = strdup(join_secret);
|
|
||||||
#if 0
|
|
||||||
discord_st->presence.spectateSecret = "SPECSPECSPEC";
|
|
||||||
#endif
|
|
||||||
discord_st->presence.partyId = strdup(discord_st->self_party_id);
|
|
||||||
discord_st->presence.partyMax = 2;
|
|
||||||
discord_st->presence.partySize = 1;
|
|
||||||
|
|
||||||
RARCH_LOG("[DISCORD]: Join secret: %s\n", join_secret);
|
|
||||||
RARCH_LOG("[DISCORD]: Party ID: %s\n", discord_st->self_party_id);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case DISCORD_PRESENCE_NETPLAY_CLIENT:
|
|
||||||
RARCH_LOG("[DISCORD]: Party ID: %s\n", discord_st->peer_party_id);
|
|
||||||
discord_st->presence.partyId = strdup(discord_st->peer_party_id);
|
|
||||||
break;
|
|
||||||
case DISCORD_PRESENCE_NETPLAY_NETPLAY_STOPPED:
|
|
||||||
{
|
|
||||||
if (!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL) &&
|
|
||||||
!netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_CONNECTED, NULL))
|
|
||||||
{
|
|
||||||
discord_st->peer_party_id[0] = '\0';
|
|
||||||
discord_st->connecting = false;
|
|
||||||
discord_st->presence.partyId = NULL;
|
|
||||||
discord_st->presence.partyMax = 0;
|
|
||||||
discord_st->presence.partySize = 0;
|
|
||||||
discord_st->presence.joinSecret = (const char*)'\0';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
#ifdef HAVE_CHEEVOS
|
|
||||||
case DISCORD_PRESENCE_RETROACHIEVEMENTS:
|
|
||||||
if (discord_st->pause_time)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (rcheevos_get_richpresence(cheevos_richpresence, sizeof(cheevos_richpresence)) > 0)
|
|
||||||
discord_st->presence.details = cheevos_richpresence;
|
|
||||||
presence = DISCORD_PRESENCE_GAME;
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
case DISCORD_PRESENCE_SHUTDOWN:
|
|
||||||
discord_st->presence.partyId = NULL;
|
|
||||||
discord_st->presence.partyMax = 0;
|
|
||||||
discord_st->presence.partySize = 0;
|
|
||||||
discord_st->presence.joinSecret = (const char*)'\0';
|
|
||||||
discord_st->connecting = false;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
Discord_UpdatePresence(&discord_st->presence);
|
|
||||||
#ifdef DISCORD_DISABLE_IO_THREAD
|
|
||||||
Discord_UpdateConnection();
|
|
||||||
#endif
|
|
||||||
discord_st->status = presence;
|
|
||||||
}
|
|
||||||
|
|
||||||
void discord_init(const char *discord_app_id, char *args)
|
|
||||||
{
|
|
||||||
DiscordEventHandlers handlers;
|
|
||||||
#ifdef _WIN32
|
|
||||||
char full_path[PATH_MAX_LENGTH];
|
|
||||||
#endif
|
|
||||||
char command[PATH_MAX_LENGTH];
|
|
||||||
discord_state_t *discord_st = &discord_state_st;
|
|
||||||
|
|
||||||
discord_st->start_time = time(0);
|
|
||||||
|
|
||||||
handlers.ready = handle_discord_ready;
|
|
||||||
handlers.disconnected = handle_discord_disconnected;
|
|
||||||
handlers.errored = handle_discord_error;
|
|
||||||
handlers.joinGame = handle_discord_join;
|
|
||||||
handlers.spectateGame = handle_discord_spectate;
|
|
||||||
handlers.joinRequest = handle_discord_join_request;
|
|
||||||
|
|
||||||
Discord_Initialize(discord_app_id, &handlers, 0, NULL);
|
|
||||||
#ifdef DISCORD_DISABLE_IO_THREAD
|
|
||||||
Discord_UpdateConnection();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
fill_pathname_application_path(full_path, sizeof(full_path));
|
|
||||||
if (strstr(args, full_path))
|
|
||||||
strlcpy(command, args, sizeof(command));
|
|
||||||
else
|
|
||||||
{
|
|
||||||
path_basedir(full_path);
|
|
||||||
strlcpy(command, full_path, sizeof(command));
|
|
||||||
strlcat(command, args, sizeof(command));
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
strcpy_literal(command, "sh -c ");
|
|
||||||
strlcat(command, args, sizeof(command));
|
|
||||||
#endif
|
|
||||||
RARCH_LOG("[DISCORD]: Registering startup command: %s\n", command);
|
|
||||||
Discord_Register(discord_app_id, command);
|
|
||||||
#ifdef DISCORD_DISABLE_IO_THREAD
|
|
||||||
Discord_UpdateConnection();
|
|
||||||
#endif
|
|
||||||
discord_st->ready = true;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static void log_counters(
|
static void log_counters(
|
||||||
struct retro_perf_counter **counters, unsigned num)
|
struct retro_perf_counter **counters, unsigned num)
|
||||||
{
|
{
|
||||||
|
|
@ -4879,8 +4422,6 @@ static void runloop_pause_checks(void)
|
||||||
|
|
||||||
if (is_paused)
|
if (is_paused)
|
||||||
{
|
{
|
||||||
RARCH_LOG("[Core]: %s\n", msg_hash_to_str(MSG_PAUSED));
|
|
||||||
|
|
||||||
#if defined(HAVE_GFX_WIDGETS)
|
#if defined(HAVE_GFX_WIDGETS)
|
||||||
if (!widgets_active)
|
if (!widgets_active)
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -4903,8 +4444,6 @@ static void runloop_pause_checks(void)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
RARCH_LOG("[Core]: %s\n", msg_hash_to_str(MSG_UNPAUSED));
|
|
||||||
|
|
||||||
#ifdef HAVE_LAKKA
|
#ifdef HAVE_LAKKA
|
||||||
set_cpu_scaling_signal(CPUSCALING_EVENT_FOCUS_CORE);
|
set_cpu_scaling_signal(CPUSCALING_EVENT_FOCUS_CORE);
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -6785,9 +6324,9 @@ bool command_event(enum event_command cmd, void *data)
|
||||||
case CMD_EVENT_DISCORD_INIT:
|
case CMD_EVENT_DISCORD_INIT:
|
||||||
#ifdef HAVE_DISCORD
|
#ifdef HAVE_DISCORD
|
||||||
{
|
{
|
||||||
bool discord_enable = settings ? settings->bools.discord_enable : false;
|
bool discord_enable = settings ? settings->bools.discord_enable : false;
|
||||||
const char *discord_app_id = settings ? settings->arrays.discord_app_id : NULL;
|
const char *discord_app_id = settings ? settings->arrays.discord_app_id : NULL;
|
||||||
discord_state_t *discord_st = &discord_state_st;
|
discord_state_t *discord_st = discord_state_get_ptr();
|
||||||
if (!settings)
|
if (!settings)
|
||||||
return false;
|
return false;
|
||||||
if (!discord_enable)
|
if (!discord_enable)
|
||||||
|
|
@ -6802,7 +6341,7 @@ bool command_event(enum event_command cmd, void *data)
|
||||||
{
|
{
|
||||||
#ifdef HAVE_DISCORD
|
#ifdef HAVE_DISCORD
|
||||||
discord_userdata_t *userdata = NULL;
|
discord_userdata_t *userdata = NULL;
|
||||||
discord_state_t *discord_st = &discord_state_st;
|
discord_state_t *discord_st = discord_state_get_ptr();
|
||||||
if (!data || !discord_st->ready)
|
if (!data || !discord_st->ready)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
|
@ -15790,7 +15329,7 @@ bool retroarch_main_quit(void)
|
||||||
settings_t *settings = config_get_ptr();
|
settings_t *settings = config_get_ptr();
|
||||||
global_t *global = global_get_ptr();
|
global_t *global = global_get_ptr();
|
||||||
#ifdef HAVE_DISCORD
|
#ifdef HAVE_DISCORD
|
||||||
discord_state_t *discord_st = &discord_state_st;
|
discord_state_t *discord_st = discord_state_get_ptr();
|
||||||
if (discord_st->inited)
|
if (discord_st->inited)
|
||||||
{
|
{
|
||||||
discord_userdata_t userdata;
|
discord_userdata_t userdata;
|
||||||
|
|
@ -17150,7 +16689,7 @@ int runloop_iterate(void)
|
||||||
#endif
|
#endif
|
||||||
bool audio_sync = settings->bools.audio_sync;
|
bool audio_sync = settings->bools.audio_sync;
|
||||||
#ifdef HAVE_DISCORD
|
#ifdef HAVE_DISCORD
|
||||||
discord_state_t *discord_st = &discord_state_st;
|
discord_state_t *discord_st = discord_state_get_ptr();
|
||||||
|
|
||||||
if (discord_st->inited)
|
if (discord_st->inited)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,17 +1,6 @@
|
||||||
#ifndef _RETROARCH_FWD_DECLS_H
|
#ifndef _RETROARCH_FWD_DECLS_H
|
||||||
#define _RETROARCH_FWD_DECLS_H
|
#define _RETROARCH_FWD_DECLS_H
|
||||||
|
|
||||||
#ifdef HAVE_DISCORD
|
|
||||||
#if defined(__cplusplus) && !defined(CXX_BUILD)
|
|
||||||
extern "C"
|
|
||||||
{
|
|
||||||
#endif
|
|
||||||
void Discord_Register(const char *a, const char *b);
|
|
||||||
#if defined(__cplusplus) && !defined(CXX_BUILD)
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static void retroarch_fail(struct rarch_state *p_rarch,
|
static void retroarch_fail(struct rarch_state *p_rarch,
|
||||||
int error_code, const char *error);
|
int error_code, const char *error);
|
||||||
static void ui_companion_driver_toggle(
|
static void ui_companion_driver_toggle(
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue