Settings: Add netplay config overlay

src/common/layered_settings_interface.h

@@ -10,6 +10,7 @@ class LayeredSettingsInterface final : public SettingsInterface
 public:
   enum Layer : u32
   {
+    LAYER_NETPLAY,
     LAYER_CMDLINE,
     LAYER_GAME,
     LAYER_INPUT,
@@ -61,7 +62,7 @@ public:
   using SettingsInterface::GetUIntValue;
 
 private:
-  static constexpr Layer FIRST_LAYER = LAYER_CMDLINE;
+  static constexpr Layer FIRST_LAYER = LAYER_NETPLAY;
   static constexpr Layer LAST_LAYER = LAYER_BASE;
 
   std::array<SettingsInterface*, NUM_LAYERS> m_layers{};

src/core/host_settings.h

@@ -69,5 +69,8 @@ void SetGameSettingsLayer(SettingsInterface* sif);
 
 /// Sets the input profile settings layer. Called by VMManager when the game changes.
 void SetInputSettingsLayer(SettingsInterface* sif);
+
+/// Sets the netplay settings layer. Use once a session is established.
+void SetNetplaySettingsLayer(SettingsInterface* sif);
 } // namespace Internal
 } // namespace Host

src/core/netplay.cpp

@@ -2,11 +2,13 @@
 #include "common/byte_stream.h"
 #include "common/gpu_texture.h"
 #include "common/log.h"
+#include "common/memory_settings_interface.h"
 #include "digital_controller.h"
 #include "ggponet.h"
 #include "pad.h"
 #include "spu.h"
 #include "system.h"
+#include "host_settings.h"
 #include <bitset>
 #include <deque>
 Log_SetChannel(Netplay);
@@ -53,6 +55,8 @@ static void SetInputs(Input inputs[2]);
 
 static LoopTimer* GetTimer();
 
+static void SetSettings();
+
 // l = local, r = remote
 static s32 Start(s32 lhandle, u16 lport, std::string& raddr, u16 rport, s32 ldelay, u32 pred);
 static void Close();
@@ -63,6 +67,12 @@ static void RunFrame(s32& waitTime);
 
 static void NetplayAdvanceFrame(Netplay::Input inputs[], int disconnect_flags);
 
+//////////////////////////////////////////////////////////////////////////
+// Variables
+//////////////////////////////////////////////////////////////////////////
+
+static MemorySettingsInterface s_settings_overlay;
+
 static LoopTimer s_timer;
 static std::string s_game_path;
 static u32 s_max_pred = 0;
@@ -79,8 +89,29 @@ static std::array<std::array<float, 32>, NUM_CONTROLLER_AND_CARD_PORTS> s_net_in
 
 // Netplay Impl
 
+void Netplay::SetSettings()
+{
+  MemorySettingsInterface& si = s_settings_overlay;
+
+  si.Clear();
+  for (u32 i = 0; i < MAX_PLAYERS; i++)
+  {
+    // Only digital pads supported for now.
+    si.SetStringValue(Controller::GetSettingsSection(i).c_str(), "Type",
+                                      Settings::GetControllerTypeName(ControllerType::DigitalController));
+  }
+
+  // No runahead or rewind, that'd be a disaster.
+  si.SetIntValue("Main", "RunaheadFrameCount", 0);
+  si.SetBoolValue("Main", "RewindEnable", false);
+
+  Host::Internal::SetNetplaySettingsLayer(&si);
+}
+
 s32 Netplay::Start(s32 lhandle, u16 lport, std::string& raddr, u16 rport, s32 ldelay, u32 pred)
 {
+  SetSettings();
+
   s_max_pred = pred;
   /*
   TODO: since saving every frame during rollback loses us time to do actual gamestate iterations it might be better to
@@ -140,6 +171,9 @@ void Netplay::Close()
   s_ggpo = nullptr;
   s_local_handle = GGPO_INVALID_HANDLE;
   s_max_pred = 0;
+
+  // Restore original settings.
+  Host::Internal::SetNetplaySettingsLayer(nullptr);
 }
 
 bool Netplay::IsActive()

src/frontend-common/host_settings.cpp

@@ -190,3 +190,9 @@ void Host::Internal::SetInputSettingsLayer(SettingsInterface* sif)
 	std::unique_lock lock(s_settings_mutex);
 	s_layered_settings_interface.SetLayer(LayeredSettingsInterface::LAYER_INPUT, sif);
 }
+
+void Host::Internal::SetNetplaySettingsLayer(SettingsInterface* sif)
+{
+  std::unique_lock lock(s_settings_mutex);
+  s_layered_settings_interface.SetLayer(LayeredSettingsInterface::LAYER_NETPLAY, sif);
+}