Options: merge SCoreStartupParameter into SConfig

Source/Core/Core/ConfigManager.h

@@ -7,10 +7,11 @@
 #include <string>
 #include <vector>
 
+#include "Common/IniFile.h"
 #include "Common/SysConf.h"
-#include "Core/CoreParameter.h"
 #include "Core/HW/EXI_Device.h"
 #include "Core/HW/SI_Device.h"
+#include "DiscIO/Volume.h"
 
 // DSP Backend Types
 #define BACKEND_NULLSOUND   _trans("No audio output")
@@ -21,6 +22,16 @@
 #define BACKEND_PULSEAUDIO  "Pulse"
 #define BACKEND_XAUDIO2     "XAudio2"
 #define BACKEND_OPENSLES    "OpenSLES"
+
+enum GPUDeterminismMode
+{
+	GPU_DETERMINISM_AUTO,
+	GPU_DETERMINISM_NONE,
+	// This is currently the only mode.  There will probably be at least
+	// one more at some point.
+	GPU_DETERMINISM_FAKE_COMPLETION,
+};
+
 struct SConfig : NonCopyable
 {
 	// Wii Devices
@@ -36,7 +47,140 @@ struct SConfig : NonCopyable
 	std::vector<std::string> m_ISOFolder;
 	bool m_RecursiveISOFolder;
 
-	SCoreStartupParameter m_LocalCoreStartupParameter;
+	// Settings
+	bool bEnableDebugging;
+	#ifdef USE_GDBSTUB
+	int iGDBPort;
+	#ifndef _WIN32
+	std::string gdb_socket;
+	#endif
+	#endif
+	bool bAutomaticStart;
+	bool bBootToPause;
+
+	int iCPUCore;
+
+	// JIT (shared between JIT and JITIL)
+	bool bJITNoBlockCache, bJITNoBlockLinking;
+	bool bJITOff;
+	bool bJITLoadStoreOff, bJITLoadStorelXzOff, bJITLoadStorelwzOff, bJITLoadStorelbzxOff;
+	bool bJITLoadStoreFloatingOff;
+	bool bJITLoadStorePairedOff;
+	bool bJITFloatingPointOff;
+	bool bJITIntegerOff;
+	bool bJITPairedOff;
+	bool bJITSystemRegistersOff;
+	bool bJITBranchOff;
+	bool bJITILTimeProfiling;
+	bool bJITILOutputIR;
+
+	bool bFastmem;
+	bool bFPRF;
+	bool bAccurateNaNs;
+
+	bool bCPUThread;
+	bool bDSPThread;
+	bool bDSPHLE;
+	bool bSkipIdle;
+	bool bSyncGPUOnSkipIdleHack;
+	bool bNTSC;
+	bool bForceNTSCJ;
+	bool bHLE_BS2;
+	bool bEnableCheats;
+	bool bEnableMemcardSaving;
+
+	bool bDPL2Decoder;
+	int iLatency;
+
+	bool bRunCompareServer;
+	bool bRunCompareClient;
+
+	bool bMMU;
+	bool bDCBZOFF;
+	int iBBDumpPort;
+	bool bFastDiscSpeed;
+
+	bool bSyncGPU;
+	int iSyncGpuMaxDistance;
+	int iSyncGpuMinDistance;
+	float fSyncGpuOverclock;
+
+	int SelectedLanguage;
+	bool bOverrideGCLanguage;
+
+	bool bWii;
+
+	// Interface settings
+	bool bConfirmStop, bHideCursor, bAutoHideCursor, bUsePanicHandlers, bOnScreenDisplayMessages;
+	std::string theme_name;
+
+	// Display settings
+	std::string strFullscreenResolution;
+	int iRenderWindowXPos, iRenderWindowYPos;
+	int iRenderWindowWidth, iRenderWindowHeight;
+	bool bRenderWindowAutoSize, bKeepWindowOnTop;
+	bool bFullscreen, bRenderToMain;
+	bool bProgressive, bDisableScreenSaver;
+
+	int iPosX, iPosY, iWidth, iHeight;
+
+	// Fifo Player related settings
+	bool bLoopFifoReplay;
+
+	enum EBootBS2
+	{
+		BOOT_DEFAULT,
+		BOOT_BS2_JAP,
+		BOOT_BS2_USA,
+		BOOT_BS2_EUR,
+	};
+
+	enum EBootType
+	{
+		BOOT_ISO,
+		BOOT_ELF,
+		BOOT_DOL,
+		BOOT_WII_NAND,
+		BOOT_BS2,
+		BOOT_DFF
+	};
+	EBootType m_BootType;
+
+	std::string m_strVideoBackend;
+	std::string m_strGPUDeterminismMode;
+
+	// set based on the string version
+	GPUDeterminismMode m_GPUDeterminismMode;
+
+	// files
+	std::string m_strFilename;
+	std::string m_strBootROM;
+	std::string m_strSRAM;
+	std::string m_strDefaultISO;
+	std::string m_strDVDRoot;
+	std::string m_strApploader;
+	std::string m_strUniqueID;
+	std::string m_strName;
+	u16 m_revision;
+
+	std::string m_perfDir;
+
+	void LoadDefaults();
+	bool AutoSetup(EBootBS2 _BootBS2);
+	const std::string &GetUniqueID() const { return m_strUniqueID; }
+	void CheckMemcardPath(std::string& memcardPath, const std::string& gameRegion, bool isSlotA);
+	DiscIO::IVolume::ELanguage GetCurrentLanguage(bool wii) const;
+
+	IniFile LoadDefaultGameIni() const;
+	IniFile LoadLocalGameIni() const;
+	IniFile LoadGameIni() const;
+
+	static IniFile LoadDefaultGameIni(const std::string& id, u16 revision);
+	static IniFile LoadLocalGameIni(const std::string& id, u16 revision);
+	static IniFile LoadGameIni(const std::string& id, u16 revision);
+
+	static std::vector<std::string> GetGameIniFilenames(const std::string& id, u16 revision);
+
 	std::string m_NANDPath;
 
 	std::string m_strMemoryCardA;