ConfigManager: In-class initialise member variables

This commit is contained in:
Léo Lam 2016-09-25 19:20:02 +02:00
parent e716a738dc
commit bf0ab79439
2 changed files with 57 additions and 68 deletions

View File

@ -27,24 +27,6 @@
SConfig* SConfig::m_Instance; SConfig* SConfig::m_Instance;
SConfig::SConfig() SConfig::SConfig()
: bEnableDebugging(false), bAutomaticStart(false), bBootToPause(false), bJITNoBlockCache(false),
bJITNoBlockLinking(false), bJITOff(false), bJITLoadStoreOff(false),
bJITLoadStorelXzOff(false), bJITLoadStorelwzOff(false), bJITLoadStorelbzxOff(false),
bJITLoadStoreFloatingOff(false), bJITLoadStorePairedOff(false), bJITFloatingPointOff(false),
bJITIntegerOff(false), bJITPairedOff(false), bJITSystemRegistersOff(false),
bJITBranchOff(false), bJITILTimeProfiling(false), bJITILOutputIR(false), bFPRF(false),
bAccurateNaNs(false), iTimingVariance(40), bCPUThread(true), bDSPThread(false), bDSPHLE(true),
bSkipIdle(true), bSyncGPUOnSkipIdleHack(true), bNTSC(false), bForceNTSCJ(false),
bHLE_BS2(true), bEnableCheats(false), bEnableMemcardSdWriting(true), bDPL2Decoder(false),
iLatency(14), bRunCompareServer(false), bRunCompareClient(false), bMMU(false),
bDCBZOFF(false), iBBDumpPort(0), bFastDiscSpeed(false), bSyncGPU(false), SelectedLanguage(0),
bOverrideGCLanguage(false), bWii(false), bConfirmStop(false), bHideCursor(false),
bAutoHideCursor(false), bUsePanicHandlers(true), bOnScreenDisplayMessages(true),
iRenderWindowXPos(-1), iRenderWindowYPos(-1), iRenderWindowWidth(640),
iRenderWindowHeight(480), bRenderWindowAutoSize(false), bKeepWindowOnTop(false),
bFullscreen(false), bRenderToMain(false), bProgressive(false), bPAL60(false),
bDisableScreenSaver(false), iPosX(100), iPosY(100), iWidth(800), iHeight(600),
m_analytics_enabled(false), m_analytics_permission_asked(false), bLoopFifoReplay(true)
{ {
LoadDefaults(); LoadDefaults();
// Make sure we have log manager // Make sure we have log manager

View File

@ -53,91 +53,98 @@ struct SConfig : NonCopyable
bool m_RecursiveISOFolder; bool m_RecursiveISOFolder;
// Settings // Settings
bool bEnableDebugging; bool bEnableDebugging = false;
#ifdef USE_GDBSTUB #ifdef USE_GDBSTUB
int iGDBPort; int iGDBPort;
#ifndef _WIN32 #ifndef _WIN32
std::string gdb_socket; std::string gdb_socket;
#endif #endif
#endif #endif
bool bAutomaticStart; bool bAutomaticStart = false;
bool bBootToPause; bool bBootToPause = false;
int iCPUCore; int iCPUCore;
// JIT (shared between JIT and JITIL) // JIT (shared between JIT and JITIL)
bool bJITNoBlockCache, bJITNoBlockLinking; bool bJITNoBlockCache = false;
bool bJITOff; bool bJITNoBlockLinking = false;
bool bJITLoadStoreOff, bJITLoadStorelXzOff, bJITLoadStorelwzOff, bJITLoadStorelbzxOff; bool bJITOff = false;
bool bJITLoadStoreFloatingOff; bool bJITLoadStoreOff = false;
bool bJITLoadStorePairedOff; bool bJITLoadStorelXzOff = false;
bool bJITFloatingPointOff; bool bJITLoadStorelwzOff = false;
bool bJITIntegerOff; bool bJITLoadStorelbzxOff = false;
bool bJITPairedOff; bool bJITLoadStoreFloatingOff = false;
bool bJITSystemRegistersOff; bool bJITLoadStorePairedOff = false;
bool bJITBranchOff; bool bJITFloatingPointOff = false;
bool bJITILTimeProfiling; bool bJITIntegerOff = false;
bool bJITILOutputIR; bool bJITPairedOff = false;
bool bJITSystemRegistersOff = false;
bool bJITBranchOff = false;
bool bJITILTimeProfiling = false;
bool bJITILOutputIR = false;
bool bFastmem; bool bFastmem;
bool bFPRF; bool bFPRF = false;
bool bAccurateNaNs; bool bAccurateNaNs = false;
int iTimingVariance; // in milli secounds int iTimingVariance = 40; // in milli secounds
bool bCPUThread; bool bCPUThread = true;
bool bDSPThread; bool bDSPThread = false;
bool bDSPHLE; bool bDSPHLE = true;
bool bSkipIdle; bool bSkipIdle = true;
bool bSyncGPUOnSkipIdleHack; bool bSyncGPUOnSkipIdleHack = true;
bool bNTSC; bool bNTSC = false;
bool bForceNTSCJ; bool bForceNTSCJ = false;
bool bHLE_BS2; bool bHLE_BS2 = true;
bool bEnableCheats; bool bEnableCheats = false;
bool bEnableMemcardSdWriting; bool bEnableMemcardSdWriting = true;
bool bDPL2Decoder; bool bDPL2Decoder = false;
int iLatency; int iLatency = 14;
bool bRunCompareServer; bool bRunCompareServer = false;
bool bRunCompareClient; bool bRunCompareClient = false;
bool bMMU; bool bMMU = false;
bool bDCBZOFF; bool bDCBZOFF = false;
int iBBDumpPort; int iBBDumpPort = 0;
bool bFastDiscSpeed; bool bFastDiscSpeed = false;
bool bSyncGPU; bool bSyncGPU = false;
int iSyncGpuMaxDistance; int iSyncGpuMaxDistance;
int iSyncGpuMinDistance; int iSyncGpuMinDistance;
float fSyncGpuOverclock; float fSyncGpuOverclock;
int SelectedLanguage; int SelectedLanguage = 0;
bool bOverrideGCLanguage; bool bOverrideGCLanguage = false;
bool bWii; bool bWii = false;
// Interface settings // Interface settings
bool bConfirmStop, bHideCursor, bAutoHideCursor, bUsePanicHandlers, bOnScreenDisplayMessages; bool bConfirmStop = false;
bool bHideCursor = false, bAutoHideCursor = false;
bool bUsePanicHandlers = true;
bool bOnScreenDisplayMessages = true;
std::string theme_name; std::string theme_name;
// Display settings // Display settings
std::string strFullscreenResolution; std::string strFullscreenResolution;
int iRenderWindowXPos, iRenderWindowYPos; int iRenderWindowXPos = -1, iRenderWindowYPos = -1;
int iRenderWindowWidth, iRenderWindowHeight; int iRenderWindowWidth = 640, iRenderWindowHeight = 480;
bool bRenderWindowAutoSize, bKeepWindowOnTop; bool bRenderWindowAutoSize = false, bKeepWindowOnTop = false;
bool bFullscreen, bRenderToMain; bool bFullscreen = false, bRenderToMain = false;
bool bProgressive, bPAL60; bool bProgressive = false, bPAL60 = false;
bool bDisableScreenSaver; bool bDisableScreenSaver = false;
int iPosX, iPosY, iWidth, iHeight; int iPosX, iPosY, iWidth, iHeight;
// Analytics settings. // Analytics settings.
std::string m_analytics_id; std::string m_analytics_id;
bool m_analytics_enabled; bool m_analytics_enabled = false;
bool m_analytics_permission_asked; bool m_analytics_permission_asked = false;
// Fifo Player related settings // Fifo Player related settings
bool bLoopFifoReplay; bool bLoopFifoReplay = true;
// Custom RTC // Custom RTC
bool bEnableCustomRTC; bool bEnableCustomRTC;