Merge pull request #5810 from spycrab/qt_netplay

Qt: Implement Netplay

Source/Core/DolphinQt2/CMakeLists.txt

@@ -66,6 +66,11 @@ set(SRCS
   GameList/GridProxyModel.cpp
   GameList/ListProxyModel.cpp
   QtUtils/BlockUserInputFilter.cpp
+  NetPlay/GameListDialog.cpp
+  NetPlay/MD5Dialog.cpp
+  NetPlay/NetPlayDialog.cpp
+  NetPlay/NetPlaySetupDialog.cpp
+  NetPlay/PadMappingDialog.cpp
   QtUtils/DoubleClickEventFilter.cpp
   QtUtils/ElidedButton.cpp
   QtUtils/ListTabWidget.cpp

Source/Core/DolphinQt2/DolphinQt2.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
@@ -47,7 +47,7 @@
       <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;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)VideoInterface;$(ProjectDir)GameList;$(ProjectDir)Settings;$(ProjectDir)Config;$(ProjectDir)Config\Mapping;$(ProjectDir)Config\Graphics;$(ProjectDir)QtUtils;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)VideoInterface;$(ProjectDir)GameList;$(ProjectDir)Settings;$(ProjectDir)Config;$(ProjectDir)Config\Mapping;$(ProjectDir)Config\Graphics;$(ProjectDir)NetPlay;$(ProjectDir)QtUtils;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Manifest>
       <AdditionalManifestFiles>DolphinQt2.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
@@ -93,6 +93,11 @@
     <QtMoc Include="Settings\AudioPane.h" />
     <QtMoc Include="MainWindow.h" />
     <QtMoc Include="MenuBar.h" />
+    <QtMoc Include="NetPlay\GameListDialog.h" />
+    <QtMoc Include="NetPlay\MD5Dialog.h" />
+    <QtMoc Include="NetPlay\NetPlayDialog.h" />
+    <QtMoc Include="NetPlay\NetPlaySetupDialog.h" />
+    <QtMoc Include="NetPlay\PadMappingDialog.h" />
     <QtMoc Include="QtUtils\DoubleClickEventFilter.h" />
     <QtMoc Include="QtUtils\WindowActivationEventFilter.h" />
     <QtMoc Include="RenderWidget.h" />
@@ -110,6 +115,7 @@
     <ClCompile Include="$(QtMocOutPrefix)FilesystemWidget.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)WindowActivationEventFilter.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)GameList.cpp" />
+    <ClCompile Include="$(QtMocOutPrefix)GameListDialog.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)GameListModel.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)GameTracker.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)GeneralPane.cpp" />
@@ -133,7 +139,11 @@
     <ClCompile Include="$(QtMocOutPrefix)MappingButton.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)MappingWidget.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)MappingWindow.cpp" />
+    <ClCompile Include="$(QtMocOutPrefix)MD5Dialog.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)MenuBar.cpp" />
+    <ClCompile Include="$(QtMocOutPrefix)NetPlayDialog.cpp" />
+    <ClCompile Include="$(QtMocOutPrefix)NetPlaySetupDialog.cpp" />
+    <ClCompile Include="$(QtMocOutPrefix)PadMappingDialog.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)PropertiesDialog.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)DoubleClickEventFilter.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)RenderWidget.cpp" />
@@ -190,6 +200,11 @@
     <ClCompile Include="MainWindow.cpp" />
     <ClCompile Include="MenuBar.cpp" />
     <ClCompile Include="QtUtils\BlockUserInputFilter.cpp" />
+    <ClCompile Include="NetPlay\GameListDialog.cpp" />
+    <ClCompile Include="NetPlay\MD5Dialog.cpp" />
+    <ClCompile Include="NetPlay\NetPlayDialog.cpp" />
+    <ClCompile Include="NetPlay\NetPlaySetupDialog.cpp" />
+    <ClCompile Include="NetPlay\PadMappingDialog.cpp" />
     <ClCompile Include="QtUtils\DoubleClickEventFilter.cpp" />
     <ClCompile Include="QtUtils\ElidedButton.cpp" />
     <ClCompile Include="QtUtils\ListTabWidget.cpp" />
@@ -308,4 +323,4 @@
     <Message Text="Copy: @(BinaryFiles) -&gt; $(BinaryOutputDir)" Importance="High" />
     <Copy SourceFiles="@(BinaryFiles)" DestinationFolder="$(BinaryOutputDir)" />
   </Target>
-</Project>
+</Project>

Source/Core/DolphinQt2/GameList/GameFile.cpp

@@ -11,6 +11,7 @@
 #include "Common/Assert.h"
 #include "Common/FileUtil.h"
 #include "Common/NandPaths.h"
+#include "Common/StringUtil.h"
 #include "Core/ConfigManager.h"
 #include "Core/HW/WiiSaveCrypted.h"
 #include "Core/IOS/ES/ES.h"
@@ -305,6 +306,51 @@ QString GameFile::GetLanguage(DiscIO::Language lang) const
   }
 }
 
+QString GameFile::GetUniqueID() const
+{
+  std::vector<std::string> info;
+  if (!GetGameID().isEmpty())
+    info.push_back(GetGameID().toStdString());
+
+  if (GetRevision() != 0)
+  {
+    info.push_back("Revision " + std::to_string(GetRevision()));
+  }
+
+  std::string name = m_long_names[DiscIO::Language::LANGUAGE_ENGLISH].toStdString();
+
+  if (name.empty())
+  {
+    if (!m_long_names.isEmpty())
+      name = m_long_names.begin().value().toStdString();
+    else
+    {
+      std::string filename, extension;
+      name = SplitPath(m_path.toStdString(), nullptr, &filename, &extension);
+      name = filename + extension;
+    }
+  }
+
+  int disc_number = GetDiscNumber() + 1;
+
+  std::string lower_name = name;
+  std::transform(lower_name.begin(), lower_name.end(), lower_name.begin(), ::tolower);
+  if (disc_number > 1 &&
+      lower_name.find(std::string("disc ") + std::to_string(disc_number)) == std::string::npos &&
+      lower_name.find(std::string("disc") + std::to_string(disc_number)) == std::string::npos)
+  {
+    info.push_back("Disc " + std::to_string(disc_number));
+  }
+
+  if (info.empty())
+    return QString::fromStdString(name);
+
+  std::ostringstream ss;
+  std::copy(info.begin(), info.end() - 1, std::ostream_iterator<std::string>(ss, ", "));
+  ss << info.back();
+  return QString::fromStdString(name + " (" + ss.str() + ")");
+}
+
 bool GameFile::IsInstalled() const
 {
   _assert_(m_platform == DiscIO::Platform::WII_WAD);

Source/Core/DolphinQt2/GameList/GameFile.h

@@ -41,6 +41,7 @@ class GameFile final
   u64 GetTitleID() const { return m_title_id; }
   u16 GetRevision() const { return m_revision; }
   QString GetInternalName() const { return m_internal_name; }
+  QString GetUniqueID() const;
   u8 GetDiscNumber() const { return m_disc_number; }
   u64 GetRawSize() const { return m_raw_size; }
   QPixmap GetBanner() const { return m_banner; }

Source/Core/DolphinQt2/GameList/GameList.cpp

@@ -34,7 +34,7 @@ static bool CompressCB(const std::string&, float, void*);
 
 GameList::GameList(QWidget* parent) : QStackedWidget(parent)
 {
-  m_model = new GameListModel(this);
+  m_model = Settings::Instance().GetGameListModel();
   m_list_proxy = new ListProxyModel(this);
   m_list_proxy->setSortCaseSensitivity(Qt::CaseInsensitive);
   m_list_proxy->setSortRole(Qt::InitialSortOrderRole);
@@ -197,6 +197,20 @@ void GameList::ShowContextMenu(const QPoint&)
 
   menu->addAction(tr("Open &containing folder"), this, &GameList::OpenContainingFolder);
   menu->addAction(tr("Delete File..."), this, &GameList::DeleteFile);
+
+  QAction* netplay_host = new QAction(tr("Host with NetPlay"), menu);
+
+  connect(netplay_host, &QAction::triggered,
+          [this, game] { emit NetPlayHost(GameFile(game).GetUniqueID()); });
+
+  connect(this, &GameList::EmulationStarted, netplay_host,
+          [netplay_host] { netplay_host->setEnabled(false); });
+  connect(this, &GameList::EmulationStopped, netplay_host,
+          [netplay_host] { netplay_host->setEnabled(true); });
+  netplay_host->setEnabled(!Core::IsRunning());
+
+  menu->addAction(netplay_host);
+
   menu->exec(QCursor::pos());
 }
 

Source/Core/DolphinQt2/GameList/GameList.h

@@ -31,6 +31,7 @@ class GameList final : public QStackedWidget
   void GameSelected();
   void EmulationStarted();
   void EmulationStopped();
+  void NetPlayHost(const QString& game_id);
 
 private:
   void ShowContextMenu(const QPoint&);

Source/Core/DolphinQt2/GameList/GameListModel.h

@@ -27,6 +27,8 @@ class GameListModel final : public QAbstractTableModel
 
   // Path of the Game at the specified index.
   QString GetPath(int index) const { return m_games[index]->GetFilePath(); }
+  // Unique ID of the Game at the specified index
+  QString GetUniqueID(int index) const { return m_games[index]->GetUniqueID(); }
   bool ShouldDisplayGameListItem(int index) const;
   enum
   {