diff --git a/.ci/linux.sh b/.ci/linux.sh index 363d6b233..4745b7b75 100755 --- a/.ci/linux.sh +++ b/.ci/linux.sh @@ -26,7 +26,7 @@ cmake .. -G Ninja \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DENABLE_ROOM_STANDALONE=OFF \ - -DUSE_DISCORD_PRESENCE=ON \ + -DENABLE_DISCORD_RPC=ON \ "${EXTRA_CMAKE_FLAGS[@]}" ninja strip -s bin/Release/* diff --git a/.ci/macos.sh b/.ci/macos.sh index 52494a71e..a0100de36 100755 --- a/.ci/macos.sh +++ b/.ci/macos.sh @@ -9,7 +9,7 @@ cmake ../.. -GNinja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_OSX_ARCHITECTURES="$BUILD_ARCH" \ -DENABLE_ROOM_STANDALONE=OFF \ - -DUSE_DISCORD_PRESENCE=ON \ + -DENABLE_DISCORD_RPC=ON \ "${EXTRA_CMAKE_FLAGS[@]}" ninja ninja bundle diff --git a/.ci/mxe.sh b/.ci/mxe.sh index 1e5153486..f088c1d92 100755 --- a/.ci/mxe.sh +++ b/.ci/mxe.sh @@ -14,7 +14,7 @@ x86_64-w64-mingw32.shared-cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DUSE_DISCORD_PRESENCE=ON \ + -DENABLE_DISCORD_RPC=ON \ -DUSE_SYSTEM_BOOST=ON \ -DUSE_SYSTEM_CRYPTOPP=ON \ "${EXTRA_CMAKE_FLAGS[@]}" diff --git a/.ci/windows.sh b/.ci/windows.sh index c627a3da3..4e15afd62 100644 --- a/.ci/windows.sh +++ b/.ci/windows.sh @@ -10,7 +10,7 @@ cmake .. -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DUSE_DISCORD_PRESENCE=ON \ + -DENABLE_DISCORD_RPC=ON \ "${EXTRA_CMAKE_FLAGS[@]}" ninja ninja bundle diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a000324b..0652dd7ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,7 +142,7 @@ CMAKE_DEPENDENT_OPTION(ENABLE_OPENGL "Enables the OpenGL renderer" ${DEFAULT_ENA # NetBSD doesn't support Vulkan yet, remove this check when it does. CMAKE_DEPENDENT_OPTION(ENABLE_VULKAN "Enables the Vulkan renderer" ON "NOT (BSD MATCHES \"NetBSD\")" OFF) -option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF) +option(ENABLE_DISCORD_RPC "Enables Discord Rich Presence" OFF) option(ENABLE_MICROPROFILE "Enables microprofile capabilities" OFF) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index b887e9028..a63ee57d7 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -276,7 +276,7 @@ if (ENABLE_CUBEB) endif() # DiscordRPC -if (USE_DISCORD_PRESENCE) +if (ENABLE_DISCORD_RPC) # rapidjson used by discord-rpc is old and doesn't correctly detect endianness for some platforms. include(TestBigEndian) test_big_endian(RAPIDJSON_BIG_ENDIAN) diff --git a/src/citra_meta/CMakeLists.txt b/src/citra_meta/CMakeLists.txt index 5d477bf87..881c13cbc 100644 --- a/src/citra_meta/CMakeLists.txt +++ b/src/citra_meta/CMakeLists.txt @@ -90,7 +90,7 @@ if (ENABLE_QT AND APPLE) target_link_libraries(citra_meta PRIVATE Qt6::GuiPrivate) endif() -if (ENABLE_QT AND USE_DISCORD_PRESENCE) +if (ENABLE_QT AND ENABLE_DISCORD_RPC) target_link_libraries(citra_meta PRIVATE discord-rpc) endif() diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index f870f770c..32c615628 100644 --- a/src/citra_qt/CMakeLists.txt +++ b/src/citra_qt/CMakeLists.txt @@ -340,13 +340,13 @@ target_compile_definitions(citra_qt PRIVATE -DQT_NO_CAST_TO_ASCII ) -if (USE_DISCORD_PRESENCE) +if (ENABLE_DISCORD_RPC) target_sources(citra_qt PUBLIC discord_impl.cpp discord_impl.h ) target_link_libraries(citra_qt PRIVATE discord-rpc) - target_compile_definitions(citra_qt PRIVATE -DUSE_DISCORD_PRESENCE) + target_compile_definitions(citra_qt PRIVATE -DENABLE_DISCORD_RPC) endif() if (ENABLE_WEB_SERVICE) diff --git a/src/citra_qt/citra_qt.cpp b/src/citra_qt/citra_qt.cpp index c76c13d28..4f0bbaba7 100644 --- a/src/citra_qt/citra_qt.cpp +++ b/src/citra_qt/citra_qt.cpp @@ -63,7 +63,7 @@ #endif #include "citra_qt/debugger/registers.h" #include "citra_qt/debugger/wait_tree.h" -#ifdef USE_DISCORD_PRESENCE +#ifdef ENABLE_DISCORD_RPC #include "citra_qt/discord.h" #endif #include "citra_qt/dumping/dumping_dialog.h" @@ -123,7 +123,7 @@ Q_IMPORT_PLUGIN(QDarwinCameraPermissionPlugin); #endif -#ifdef USE_DISCORD_PRESENCE +#ifdef ENABLE_DISCORD_RPC #include "citra_qt/discord_impl.h" #endif @@ -422,7 +422,7 @@ GMainWindow::GMainWindow(Core::System& system_) default_theme_paths = QIcon::themeSearchPaths(); UpdateUITheme(); -#ifdef USE_DISCORD_PRESENCE +#ifdef ENABLE_DISCORD_RPC SetDiscordEnabled(UISettings::values.enable_discord_presence.GetValue()); discord_rpc->Update(false); #endif @@ -1627,7 +1627,7 @@ void GMainWindow::ShutdownGame() { AllowOSSleep(); -#ifdef USE_DISCORD_PRESENCE +#ifdef ENABLE_DISCORD_RPC discord_rpc->Pause(); #endif @@ -1658,7 +1658,7 @@ void GMainWindow::ShutdownGame() { OnCloseMovie(); -#ifdef USE_DISCORD_PRESENCE +#ifdef ENABLE_DISCORD_RPC discord_rpc->Update(false); #endif #ifdef __unix__ @@ -2602,7 +2602,7 @@ void GMainWindow::OnResumeGame(bool first_start) { play_time_manager->Start(); if (first_start) { -#ifdef USE_DISCORD_PRESENCE +#ifdef ENABLE_DISCORD_RPC discord_rpc->Update(true); #endif } @@ -2945,7 +2945,7 @@ void GMainWindow::OnConfigure() { const int old_input_profile_index = Settings::values.current_input_profile_index; const auto old_input_profiles = Settings::values.input_profiles; const auto old_touch_from_button_maps = Settings::values.touch_from_button_maps; -#ifdef USE_DISCORD_PRESENCE +#ifdef ENABLE_DISCORD_RPC const bool old_discord_presence = UISettings::values.enable_discord_presence.GetValue(); #endif #ifdef __unix__ @@ -2959,7 +2959,7 @@ void GMainWindow::OnConfigure() { if (UISettings::values.theme != old_theme) { UpdateUITheme(); } -#ifdef USE_DISCORD_PRESENCE +#ifdef ENABLE_DISCORD_RPC if (UISettings::values.enable_discord_presence.GetValue() != old_discord_presence) { SetDiscordEnabled(UISettings::values.enable_discord_presence.GetValue()); discord_rpc->Update(system.IsPoweredOn()); @@ -4317,7 +4317,7 @@ void GMainWindow::RetranslateStatusBar() { multiplayer_state->retranslateUi(); } -#ifdef USE_DISCORD_PRESENCE +#ifdef ENABLE_DISCORD_RPC void GMainWindow::SetDiscordEnabled([[maybe_unused]] bool state) { if (state) { discord_rpc = std::make_unique(system); diff --git a/src/citra_qt/citra_qt.h b/src/citra_qt/citra_qt.h index ba8b233c8..df580ad0f 100644 --- a/src/citra_qt/citra_qt.h +++ b/src/citra_qt/citra_qt.h @@ -67,7 +67,7 @@ namespace Camera { class QtMultimediaCameraHandlerFactory; } -#ifdef USE_DISCORD_PRESENCE +#ifdef ENABLE_DISCORD_RPC namespace DiscordRPC { class DiscordInterface; } @@ -110,7 +110,7 @@ public: GameList* game_list; std::unique_ptr play_time_manager; -#ifdef USE_DISCORD_PRESENCE +#ifdef ENABLE_DISCORD_RPC std::unique_ptr discord_rpc; #endif @@ -174,7 +174,7 @@ private: void BootGame(const QString& filename); void ShutdownGame(); -#ifdef USE_DISCORD_PRESENCE +#ifdef ENABLE_DISCORD_RPC void SetDiscordEnabled(bool state); #endif void LoadAmiibo(const QString& filename); diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp index 06b24b39a..ea474d30e 100644 --- a/src/citra_qt/configuration/config.cpp +++ b/src/citra_qt/configuration/config.cpp @@ -834,7 +834,7 @@ void QtConfig::ReadUIValues() { UISettings::values.theme = ReadSetting(Settings::QKeys::theme, QString::fromUtf8(UISettings::themes[0].second)) .toString(); -#ifdef USE_DISCORD_PRESENCE +#ifdef ENABLE_DISCORD_RPC ReadBasicSetting(UISettings::values.enable_discord_presence); #endif ReadBasicSetting(UISettings::values.screenshot_resolution_factor); @@ -1367,7 +1367,7 @@ void QtConfig::SaveUIValues() { if (global) { WriteSetting(Settings::QKeys::theme, UISettings::values.theme, QString::fromUtf8(UISettings::themes[0].second)); -#ifdef USE_DISCORD_PRESENCE +#ifdef ENABLE_DISCORD_RPC WriteBasicSetting(UISettings::values.enable_discord_presence); #endif WriteBasicSetting(UISettings::values.screenshot_resolution_factor); diff --git a/src/citra_qt/configuration/configure_web.cpp b/src/citra_qt/configuration/configure_web.cpp index 9d83547df..53c80eb3c 100644 --- a/src/citra_qt/configuration/configure_web.cpp +++ b/src/citra_qt/configuration/configure_web.cpp @@ -14,7 +14,7 @@ ConfigureWeb::ConfigureWeb(QWidget* parent) : QWidget(parent), ui(std::make_unique()) { ui->setupUi(this); -#ifndef USE_DISCORD_PRESENCE +#ifndef ENABLE_DISCORD_RPC ui->discord_group->setEnabled(false); #endif SetConfiguration(); @@ -23,13 +23,13 @@ ConfigureWeb::ConfigureWeb(QWidget* parent) ConfigureWeb::~ConfigureWeb() = default; void ConfigureWeb::SetConfiguration() { -#ifdef USE_DISCORD_PRESENCE +#ifdef ENABLE_DISCORD_RPC ui->toggle_discordrpc->setChecked(UISettings::values.enable_discord_presence.GetValue()); #endif } void ConfigureWeb::ApplyConfiguration() { -#ifdef USE_DISCORD_PRESENCE +#ifdef ENABLE_DISCORD_RPC UISettings::values.enable_discord_presence = ui->toggle_discordrpc->isChecked(); #endif } diff --git a/src/citra_qt/uisettings.h b/src/citra_qt/uisettings.h index ef87b3fe3..b2a459071 100644 --- a/src/citra_qt/uisettings.h +++ b/src/citra_qt/uisettings.h @@ -97,7 +97,7 @@ struct Values { Settings::Setting inserted_cartridge{"", "inserted_cartridge"}; -#ifdef USE_DISCORD_PRESENCE +#ifdef ENABLE_DISCORD_RPC // Discord RPC Settings::Setting enable_discord_presence{true, "enable_discord_presence"}; #endif