Merge pull request #6983 from yourWaifu/add-discord-rpc-support

Add Discord Rich Presence support

Source/Core/DolphinQt2/CMakeLists.txt

@@ -220,3 +220,7 @@ if(APPLE)
 else()
   install(TARGETS dolphin-emu RUNTIME DESTINATION ${bindir})
 endif()
+
+if(USE_DISCORD_PRESENCE)
+  target_compile_definitions(dolphin-emu PRIVATE -DUSE_DISCORD_PRESENCE)
+endif()

Source/Core/DolphinQt2/DolphinQt2.vcxproj

@@ -40,8 +40,8 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Link>
-      <AdditionalLibraryDirectories>$(ExternalsDir)ffmpeg\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(ExternalsDir)ffmpeg\lib;$(IntDir)..\discord-rpc\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>avrt.lib;iphlpapi.lib;winmm.lib;setupapi.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;Shlwapi.lib;discord-rpc.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir)VideoInterface;$(ProjectDir)GameList;$(ProjectDir)Debugger;$(ProjectDir)Settings;$(ProjectDir)Config;$(ProjectDir)Config\Mapping;$(ProjectDir)Config\Graphics;$(ProjectDir)NetPlay;$(ProjectDir)QtUtils;$(ProjectDir)TAS;$(ProjectDir)FIFO;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

Source/Core/DolphinQt2/MainWindow.cpp

@@ -84,6 +84,7 @@
 
 #include "InputCommon/ControllerInterface/ControllerInterface.h"
 
+#include "UICommon/DiscordPresence.h"
 #include "UICommon/UICommon.h"
 
 #include "VideoCommon/VideoConfig.h"
@@ -632,6 +633,9 @@ void MainWindow::OnStopComplete()
   m_stop_requested = false;
   HideRenderWidget();
   EnableScreenSaver(true);
+#ifdef USE_DISCORD_PRESENCE
+  Discord::UpdateDiscordPresence();
+#endif
 
   SetFullScreenResolution(false);
 
@@ -783,6 +787,9 @@ void MainWindow::StartGame(std::unique_ptr<BootParameters>&& parameters)
   }
 
   ShowRenderWidget();
+#ifdef USE_DISCORD_PRESENCE
+  Discord::UpdateDiscordPresence();
+#endif
 
   if (SConfig::GetInstance().bFullscreen)
     m_fullscreen_requested = true;

Source/Core/DolphinQt2/Settings/GeneralPane.cpp

@@ -19,6 +19,7 @@
 #include <QWidget>
 
 #include "Core/Analytics.h"
+#include "Core/Config/UISettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
 #include "Core/PowerPC/PowerPC.h"
@@ -26,6 +27,9 @@
 #include "DolphinQt2/Settings.h"
 
 #include "UICommon/AutoUpdate.h"
+#ifdef USE_DISCORD_PRESENCE
+#include "UICommon/DiscordPresence.h"
+#endif
 
 constexpr int AUTO_UPDATE_DISABLE_INDEX = 0;
 constexpr int AUTO_UPDATE_STABLE_INDEX = 1;
@@ -87,6 +91,9 @@ void GeneralPane::ConnectLayout()
 {
   connect(m_checkbox_dualcore, &QCheckBox::toggled, this, &GeneralPane::OnSaveConfig);
   connect(m_checkbox_cheats, &QCheckBox::toggled, this, &GeneralPane::OnSaveConfig);
+#ifdef USE_DISCORD_PRESENCE
+  connect(m_checkbox_discord_presence, &QCheckBox::toggled, this, &GeneralPane::OnSaveConfig);
+#endif
 
   if (AutoUpdateChecker::SystemSupportsAutoUpdates())
   {
@@ -125,6 +132,11 @@ void GeneralPane::CreateBasic()
   m_checkbox_cheats = new QCheckBox(tr("Enable Cheats"));
   basic_group_layout->addWidget(m_checkbox_cheats);
 
+#ifdef USE_DISCORD_PRESENCE
+  m_checkbox_discord_presence = new QCheckBox(tr("Show Current Game on Discord"));
+  basic_group_layout->addWidget(m_checkbox_discord_presence);
+#endif
+
   auto* speed_limit_layout = new QFormLayout;
   speed_limit_layout->setFormAlignment(Qt::AlignLeft | Qt::AlignTop);
   speed_limit_layout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow);
@@ -219,6 +231,9 @@ void GeneralPane::LoadConfig()
 #endif
   m_checkbox_dualcore->setChecked(SConfig::GetInstance().bCPUThread);
   m_checkbox_cheats->setChecked(Settings::Instance().GetCheatsEnabled());
+#ifdef USE_DISCORD_PRESENCE
+  m_checkbox_discord_presence->setChecked(Config::Get(Config::MAIN_USE_DISCORD_PRESENCE));
+#endif
   int selection = qRound(SConfig::GetInstance().m_EmulationSpeed * 10);
   if (selection < m_combobox_speedlimit->count())
     m_combobox_speedlimit->setCurrentIndex(selection);
@@ -264,6 +279,10 @@ void GeneralPane::OnSaveConfig()
         UpdateTrackFromIndex(m_combobox_update_track->currentIndex()));
   }
 
+#ifdef USE_DISCORD_PRESENCE
+  Discord::SetDiscordPresenceEnabled(m_checkbox_discord_presence->isChecked());
+#endif
+
 #if defined(USE_ANALYTICS) && USE_ANALYTICS
   Settings::Instance().SetAnalyticsEnabled(m_checkbox_enable_analytics->isChecked());
 #endif

Source/Core/DolphinQt2/Settings/GeneralPane.h

@@ -44,6 +44,9 @@ private:
   QComboBox* m_combobox_update_track;
   QCheckBox* m_checkbox_dualcore;
   QCheckBox* m_checkbox_cheats;
+#ifdef USE_DISCORD_PRESENCE
+  QCheckBox* m_checkbox_discord_presence;
+#endif
   QLabel* m_label_speedlimit;
 
   std::vector<QRadioButton*> m_cpu_cores;