Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2025-02-18 11:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

System: Fix Discord Rich Presence

Browse source
This commit is contained in:
Stenzek 2023-10-29 22:46:02 +10:00
parent 6ca098db97
commit 538266aacd
No known key found for this signature in database
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/core/system.cpp
View file

@ -255,6 +255,9 @@ void System::Internal::ProcessStartup()
#endif #endif
if (g_settings.achievements_enabled) if (g_settings.achievements_enabled)
Achievements::Initialize(); Achievements::Initialize();
if (g_settings.enable_discord_presence)
InitializeDiscordPresence();
} }
void System::Internal::ProcessShutdown() void System::Internal::ProcessShutdown()
@ -322,6 +325,11 @@ bool System::IsValid()
return s_state == State::Running || s_state == State::Paused; return s_state == State::Running || s_state == State::Paused;
} }
bool System::IsValidOrInitializing()
{
return s_state == State::Starting || s_state == State::Running || s_state == State::Paused;
}
bool System::IsExecuting() bool System::IsExecuting()
{ {
DebugAssert(s_state != State::Shutdown); DebugAssert(s_state != State::Shutdown);
@ -4722,7 +4730,20 @@ void System::UpdateDiscordPresence()
rp.largeImageKey = "duckstation_logo"; rp.largeImageKey = "duckstation_logo";
rp.largeImageText = "DuckStation PS1/PSX Emulator"; rp.largeImageText = "DuckStation PS1/PSX Emulator";
rp.startTimestamp = std::time(nullptr); rp.startTimestamp = std::time(nullptr);
rp.details = System::IsValid() ? System::GetGameTitle().c_str() : "No Game Running"; rp.details = "No Game Running";
if (IsValidOrInitializing())
{
// Use disc set name if it's not a custom title.
if (s_running_game_entry && !s_running_game_entry->disc_set_name.empty() &&
s_running_game_title == s_running_game_entry->title)
{
rp.details = s_running_game_entry->disc_set_name.c_str();
}
else
{
rp.details = s_running_game_title.empty() ? "Unknown Game" : s_running_game_title.c_str();
}
}
std::string state_string; std::string state_string;
if (Achievements::HasRichPresence()) if (Achievements::HasRichPresence())

1
src/core/system.h
View file

@ -144,6 +144,7 @@ bool IsExecutionInterrupted();
bool IsPaused(); bool IsPaused();
bool IsShutdown(); bool IsShutdown();
bool IsValid(); bool IsValid();
bool IsValidOrInitializing();
bool IsExecuting(); bool IsExecuting();
bool IsStartupCancelled(); bool IsStartupCancelled();