Refactoring - removed statics from EmulationSettings

Author: SourMesen

Core/APU.cpp

@@ -17,6 +17,7 @@ APU::APU(shared_ptr<Console> console)
 
 	_console = console;
 	_mixer = _console->GetSoundMixer();
+	_settings = _console->GetSettings();
 
 	_squareChannel[0].reset(new SquareChannel(AudioChannel::Square1, _console, _mixer.get(), true));
 	_squareChannel[1].reset(new SquareChannel(AudioChannel::Square2, _console, _mixer.get(), false));
@@ -197,10 +198,10 @@ void APU::EndFrame()
 void APU::ProcessCpuClock()
 {
 	if(_apuEnabled) {
-		if(EmulationSettings::GetOverclockRate() == 100 || !EmulationSettings::GetOverclockAdjustApu()) {
+		if(_settings->GetOverclockRate() == 100 || !_settings->GetOverclockAdjustApu()) {
 			Exec();
 		} else {
-			_cyclesNeeded += 1.0 / ((double)EmulationSettings::GetOverclockRate() / 100.0);
+			_cyclesNeeded += 1.0 / ((double)_settings->GetOverclockRate() / 100.0);
 			while(_cyclesNeeded >= 1.0) {
 				Exec();
 				_cyclesNeeded--;

Core/APU.h

@@ -36,6 +36,7 @@ class APU : public Snapshotable, public IMemoryHandler
 
 		shared_ptr<Console> _console;
 		shared_ptr<SoundMixer> _mixer;
+		EmulationSettings* _settings;
 
 		NesModel _nesModel;
 

Core/ArkanoidController.h

@@ -23,9 +23,9 @@ class ArkanoidController : public BaseControlDevice
 
 	void InternalSetStateFromInput() override
 	{
-		if(EmulationSettings::InputEnabled()) {
+		if(_console->GetSettings()->InputEnabled()) {
 			SetPressedState(Buttons::Fire, KeyManager::IsMouseButtonPressed(MouseButton::LeftButton));
-			SetMovement(KeyManager::GetMouseMovement(EmulationSettings::GetMouseSensitivity(MouseDevice::ArkanoidController)));
+			SetMovement(KeyManager::GetMouseMovement(_console->GetSettings()->GetMouseSensitivity(MouseDevice::ArkanoidController)));
 		}
 	}
 
@@ -50,7 +50,7 @@ class ArkanoidController : public BaseControlDevice
 	}
 
 public:
-	ArkanoidController(uint8_t port) : BaseControlDevice(port)
+	ArkanoidController(shared_ptr<Console> console, uint8_t port) : BaseControlDevice(console, port)
 	{
 	}
 

Core/AsciiTurboFile.h

@@ -24,7 +24,7 @@ class AsciiTurboFile : public BaseControlDevice, public IBattery
 	}
 
 public:
-	AsciiTurboFile() : BaseControlDevice(BaseControlDevice::ExpDevicePort)
+	AsciiTurboFile(shared_ptr<Console> console) : BaseControlDevice(console, BaseControlDevice::ExpDevicePort)
 	{
 		BatteryManager::LoadBattery(".tf", _data, AsciiTurboFile::FileSize);
 	}

Core/AutoSaveManager.cpp

@@ -11,7 +11,7 @@ AutoSaveManager::AutoSaveManager(shared_ptr<Console> console)
 	_autoSaveThread = std::thread([=]() {
 		while(!_stopThread) {
 			bool showMessage = false;
-			uint32_t autoSaveDelay = EmulationSettings::GetAutoSaveDelay(showMessage) * 60 * 1000;
+			uint32_t autoSaveDelay = console->GetSettings()->GetAutoSaveDelay(showMessage) * 60 * 1000;
 			if(autoSaveDelay > 0) {
 				if(_timer.GetElapsedMS() > autoSaveDelay) {
 					if(!console->IsDebuggerAttached()) {

Core/AutomaticRomTest.cpp

@@ -103,25 +103,26 @@ void AutomaticRomTest::ProcessNotification(ConsoleNotificationType type, void* p
 
 int32_t AutomaticRomTest::Run(string filename)
 {
-	EmulationSettings::SetMasterVolume(0);
 	_console.reset(new Console());
+	EmulationSettings* settings = _console->GetSettings();
+	settings->SetMasterVolume(0);
 	_console->GetNotificationManager()->RegisterNotificationListener(shared_from_this());
 	if(_console->Initialize(filename)) {
 		_console->GetControlManager()->RegisterInputProvider(this);
 
-		EmulationSettings::SetFlags(EmulationFlags::ForceMaxSpeed);
-		EmulationSettings::ClearFlags(EmulationFlags::Paused);
+		settings->SetFlags(EmulationFlags::ForceMaxSpeed);
+		settings->ClearFlags(EmulationFlags::Paused);
 		_signal.Wait();
 
-		EmulationSettings::SetFlags(EmulationFlags::Paused);
+		settings->SetFlags(EmulationFlags::Paused);
 
 		if(_console->GetFrameCount() < 1800) {
 			//Finished early
 			_errorCode |= 0x10;
 		}
 
-		EmulationSettings::ClearFlags(EmulationFlags::ForceMaxSpeed);
-		EmulationSettings::SetMasterVolume(1.0);
+		settings->ClearFlags(EmulationFlags::ForceMaxSpeed);
+		settings->SetMasterVolume(1.0);
 
 		_console->GetControlManager()->UnregisterInputProvider(this);
 		_console->Stop();

Core/AviRecorder.cpp

@@ -29,9 +29,9 @@ AviRecorder::~AviRecorder()
 uint32_t AviRecorder::GetFps()
 {
 	if(_console->GetModel() == NesModel::NTSC) {
-		return EmulationSettings::CheckFlag(EmulationFlags::IntegerFpsMode) ? 60000000 : 60098812;
+		return _console->GetSettings()->CheckFlag(EmulationFlags::IntegerFpsMode) ? 60000000 : 60098812;
 	} else {
-		return EmulationSettings::CheckFlag(EmulationFlags::IntegerFpsMode) ? 50000000 : 50006978;
+		return _console->GetSettings()->CheckFlag(EmulationFlags::IntegerFpsMode) ? 50000000 : 50006978;
 	}
 }
 

Core/BandaiHyperShot.h

@@ -25,7 +25,7 @@ class BandaiHyperShot : public StandardController
 	{
 		StandardController::InternalSetStateFromInput();
 
-		if(EmulationSettings::InputEnabled()) {
+		if(_console->GetSettings()->InputEnabled()) {
 			SetPressedState(ZapperButtons::Fire, KeyManager::IsMouseButtonPressed(MouseButton::LeftButton));
 
 			MousePosition pos = KeyManager::GetMousePosition();

Core/BandaiKaraoke.h

@@ -23,7 +23,7 @@ class BandaiKaraoke : public BaseMapper
 		SelectPRGPage(1, 0x07);
 		SelectCHRPage(0, 0);
 
-		_mapperControlDevice.reset(new BandaiMicrophone(_console, EmulationSettings::GetControllerKeys(0)));
+		_mapperControlDevice.reset(new BandaiMicrophone(_console, _console->GetSettings()->GetControllerKeys(0)));
 	}
 
 	uint8_t ReadRegister(uint16_t addr) override

Core/BandaiMicrophone.h

@@ -6,8 +6,6 @@
 class BandaiMicrophone : public BaseControlDevice
 {
 protected:
-	shared_ptr<Console> _console;
-
 	enum Buttons { A, B, Microphone };
 
 	string GetKeyNames() override
@@ -18,7 +16,7 @@ class BandaiMicrophone : public BaseControlDevice
 	void InternalSetStateFromInput() override
 	{
 		//Make sure the key bindings are properly updated (not ideal, but good enough)
-		_keyMappings = EmulationSettings::GetControllerKeys(0).GetKeyMappingArray();
+		_keyMappings = _console->GetSettings()->GetControllerKeys(0).GetKeyMappingArray();
 
 		for(KeyMapping keyMapping : _keyMappings) {
 			SetPressedState(Buttons::A, keyMapping.BandaiMicrophoneButtons[0]);
@@ -31,7 +29,7 @@ class BandaiMicrophone : public BaseControlDevice
 	}
 
 public:
-	BandaiMicrophone(shared_ptr<Console> console, KeyMappingSet keyMappings) : BaseControlDevice(BaseControlDevice::MapperInputPort, keyMappings)
+	BandaiMicrophone(shared_ptr<Console> console, KeyMappingSet keyMappings) : BaseControlDevice(console, BaseControlDevice::MapperInputPort, keyMappings)
 	{
 	}