Re-do (and optimization) of client side music code to prevent it from syncing from host to client

Author: Motobug

Source/Core/Core/BootManager.cpp

@@ -95,7 +95,6 @@ bool BootCore(Core::System& system, std::unique_ptr<BootParameters> boot,
 
     Config::AddLayer(ConfigLoaders::GenerateNetPlayConfigLoader(*netplay_settings));
     StartUp.bCopyWiiSaveNetplay = netplay_settings->savedata_load;
-    StartUp.bBrawlMusicOff = netplay_settings->brawlmusic_off;
     StartUp.bIsSpectator = netplay_settings->is_spectator;
   }
 

Source/Core/Core/GeckoCode.cpp

@@ -22,7 +22,6 @@
 #include "Core/PowerPC/MMU.h"
 #include "Core/PowerPC/PowerPC.h"
 #include "Core/System.h"
-#include "Core/NetPlayProto.h"
 
 #include <iostream>
 

Source/Core/Core/NetPlayClient.cpp

@@ -910,7 +910,6 @@ void NetPlayClient::OnStartGame(sf::Packet& packet)
     packet >> m_net_settings.oc_factor;
     packet >> m_net_settings.vi_oc_enable;
     packet >> m_net_settings.vi_oc_factor;
-    packet >> m_net_settings.brawlmusic_off;
     packet >> m_net_settings.is_spectator;
 
     for (auto slot : ExpansionInterface::SLOTS)

Source/Core/Core/NetPlayClient.h

@@ -76,7 +76,6 @@ class NetPlayUI
   virtual void OnTtlDetermined(u8 ttl) = 0;
 
   virtual bool IsRecording() = 0;
-  virtual bool IsMusicOff() = 0;
   virtual bool IsSpectator() = 0;
   virtual std::shared_ptr<const UICommon::GameFile>
   FindGameFile(const SyncIdentifier& sync_identifier,

Source/Core/Core/NetPlayProto.h

@@ -49,7 +49,6 @@ struct NetSettings
   float oc_factor = 0;
   bool vi_oc_enable = false;
   float vi_oc_factor = 0;
-  bool brawlmusic_off = false;
   bool is_spectator = false;
   Common::EnumMap<ExpansionInterface::EXIDeviceType, ExpansionInterface::MAX_SLOT> exi_device{};
   int memcard_size_override = -1;

Source/Core/Core/NetPlayServer.cpp

@@ -1503,7 +1503,6 @@ bool NetPlayServer::SetupNetSettings()
   settings.golf_mode = Config::Get(Config::NETPLAY_NETWORK_MODE) == "golf";
   settings.use_fma = DoAllPlayersHaveHardwareFMA();
   settings.hide_remote_gbas = Config::Get(Config::NETPLAY_HIDE_REMOTE_GBAS);
-  settings.brawlmusic_off = Config::Get(Config::NETPLAY_BRAWL_MUSIC_OFF);
   settings.is_spectator = Config::Get(Config::NETPLAY_IS_SPECTATOR);
 
   // Unload GameINI to restore things to normal
@@ -1650,7 +1649,6 @@ bool NetPlayServer::StartGame()
   spac << m_settings.oc_factor;
   spac << m_settings.vi_oc_enable;
   spac << m_settings.vi_oc_factor;
-  spac << m_settings.brawlmusic_off;
   spac << m_settings.is_spectator;
 
   for (auto slot : ExpansionInterface::SLOTS)

Source/Core/Core/PatchEngine.cpp

@@ -27,6 +27,7 @@
 #include "Core/ActionReplay.h"
 #include "Core/CheatCodes.h"
 #include "Core/Config/SessionSettings.h"
+#include "Core/Config/NetplaySettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/NetPlayProto.h"
 #include "Core/Core.h"
@@ -37,6 +38,8 @@
 #include "Core/PowerPC/PowerPC.h"
 #include "Core/System.h"
 
+
+
 namespace PatchEngine
 {
 constexpr std::array<const char*, 3> s_patch_type_strings{{
@@ -102,7 +105,7 @@ std::string SerializeLine(const PatchEntry& entry)
 
 static bool IsEnabledMusicCode(const Patch& patch)
 {
-  if (NetPlay::IsNetPlayRunning() && patch.name == "[P+] Music Off")
+  if (NetPlay::IsNetPlayRunning() && patch.name == "[P+] Music Off" && Config::Get(Config::NETPLAY_BRAWL_MUSIC_OFF))
   {
     return SConfig::GetInstance().bBrawlMusicOff;
   }

Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp

@@ -473,14 +473,6 @@ bool NetPlayDialog::IsSpectator()
   return false;
 }
 
-bool NetPlayDialog::IsMusicOff()
-{
-  std::optional<bool> brawlmusic_off = RunOnObject(m_brawlmusic_off, &QCheckBox::isChecked);
-  if (brawlmusic_off)
-    return *brawlmusic_off;
-  return false;
-}
-
 void NetPlayDialog::OnChat()
 {
   QueueOnObject(this, [this] {

Source/Core/DolphinQt/NetPlay/NetPlayDialog.h

@@ -79,7 +79,6 @@ class NetPlayDialog : public QDialog, public NetPlay::NetPlayUI
   void OnIndexRefreshFailed(const std::string error) override;
 
   bool IsRecording() override;
-  bool IsMusicOff() override;
   bool IsSpectator() override;
   void IsSpectatorEnabled(bool enabled);
   std::shared_ptr<const UICommon::GameFile>