mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-04 08:22:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed getInstance implementation with Singleton class.

Browse Source
This commit is contained in:
delledev 2024-10-03 18:29:48 +03:00
parent fb18a7e508
commit c8867545ca
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/discord_rpc_handler.h
View File

@ -20,11 +20,6 @@ class RPC {
RPCStatus status; RPCStatus status;
public: public:
static RPC& getInstance() {
static RPC instance;
return instance;
}
void init(); void init();
void setStatusIdling(); void setStatusIdling();
void setStatusPlaying(const std::string& game_name, const std::string& game_id); void setStatusPlaying(const std::string& game_name, const std::string& game_id);

7
src/emulator.cpp
View File

@ -213,10 +213,11 @@ void Emulator::Run(const std::filesystem::path& file) {
// Discord RPC // Discord RPC
if (Config::getEnableDiscordRPC()) { if (Config::getEnableDiscordRPC()) {
if (DiscordRPCHandler::RPC::getInstance().getRPCEnabled() == false) { auto* rpc = Common::Singleton<DiscordRPCHandler::RPC>::Instance();
DiscordRPCHandler::RPC::getInstance().init(); if (rpc->getRPCEnabled() == false) {
rpc->init();
} }
DiscordRPCHandler::RPC::getInstance().setStatusPlaying(game_info.title, id); rpc->setStatusPlaying(game_info.title, id);
} }
// start execution // start execution

5
src/qt_gui/main_window.cpp
View File

@ -72,8 +72,9 @@ bool MainWindow::Init() {
// Initialize Discord RPC // Initialize Discord RPC
if (Config::getEnableDiscordRPC()) { if (Config::getEnableDiscordRPC()) {
DiscordRPCHandler::RPC::getInstance().init(); auto* rpc = Common::Singleton<DiscordRPCHandler::RPC>::Instance();
DiscordRPCHandler::RPC::getInstance().setStatusIdling(); rpc->init();
rpc->setStatusIdling();
} }
return true; return true;

9
src/qt_gui/settings_dialog.cpp
View File

@ -154,11 +154,12 @@ SettingsDialog::SettingsDialog(std::span<const QString> physical_devices, QWidge
connect(ui->discordRPCCheckbox, &QCheckBox::stateChanged, this, [](int val) { connect(ui->discordRPCCheckbox, &QCheckBox::stateChanged, this, [](int val) {
Config::setEnableDiscordRPC(val); Config::setEnableDiscordRPC(val);
if (val) { auto* rpc = Common::Singleton<DiscordRPCHandler::RPC>::Instance();
DiscordRPCHandler::RPC::getInstance().init(); if (val == Qt::Checked) {
DiscordRPCHandler::RPC::getInstance().setStatusIdling(); rpc->init();
rpc->setStatusIdling();
} else { } else {
DiscordRPCHandler::RPC::getInstance().shutdown(); rpc->shutdown();
} }
}); });
} }