diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp index f97b0ba75d..9adaa186f2 100644 --- a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp @@ -23,22 +23,22 @@ void AudioCommonConfig::Load(IniFile &file) { file.Get("Config", "EnableDTKMusic", &m_EnableDTKMusic, true); file.Get("Config", "EnableThrottle", &m_EnableThrottle, true); file.Get("Config", "EnableJIT", &m_EnableJIT, true); - file.Get("Config", "Volume", &m_Volume, 75); + file.Get("Config", "Volume", &m_Volume, 100); #ifdef _WIN32 file.Get("Config", "Backend", &sBackend, BACKEND_DIRECTSOUND); - file.Get("Config", "Frequency", &sFrequency, "32,000 Hz"); + file.Get("Config", "Frequency", &sFrequency, "48,000 Hz"); #elif defined __APPLE__ std::string temp; file.Get("Config", "Backend", &temp, BACKEND_COREAUDIO); strncpy(sBackend, temp.c_str(), 128); - file.Get("Config", "Frequency", &temp, "32,000 Hz"); + file.Get("Config", "Frequency", &temp, "48,000 Hz"); strncpy(sFrequency, temp.c_str(), 128); #elif defined __linux__ file.Get("Config", "Backend", &sBackend, BACKEND_ALSA); - file.Get("Config", "Frequency", &sFrequency, "32,000 Hz"); + file.Get("Config", "Frequency", &sFrequency, "48,000 Hz"); #else file.Get("Config", "Backend", &sBackend, BACKEND_OPENAL); - file.Get("Config", "Frequency", &sFrequency, "32,000 Hz"); + file.Get("Config", "Frequency", &sFrequency, "48,000 Hz"); #endif } diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index c3d41d8eed..3f203ceed3 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -277,7 +277,7 @@ void SConfig::LoadSettings() ini.Get("Core", "MemcardA", &m_strMemoryCardA); ini.Get("Core", "MemcardB", &m_strMemoryCardB); ini.Get("Core", "SlotA", (int*)&m_EXIDevice[0], EXIDEVICE_MEMORYCARD_A); - ini.Get("Core", "SlotB", (int*)&m_EXIDevice[1], EXIDEVICE_MEMORYCARD_B); + ini.Get("Core", "SlotB", (int*)&m_EXIDevice[1], EXIDEVICE_NONE); ini.Get("Core", "SerialPort1", (int*)&m_EXIDevice[2], EXIDEVICE_NONE); ini.Get("Core", "ProfiledReJIT",&m_LocalCoreStartupParameter.bJITProfiledReJIT, false); ini.Get("Core", "TimeProfiling",&m_LocalCoreStartupParameter.bJITILTimeProfiling, false); diff --git a/Source/Core/DolphinWX/Src/LogWindow.cpp b/Source/Core/DolphinWX/Src/LogWindow.cpp index e41b924b53..ae0838e807 100644 --- a/Source/Core/DolphinWX/Src/LogWindow.cpp +++ b/Source/Core/DolphinWX/Src/LogWindow.cpp @@ -216,7 +216,7 @@ void CLogWindow::LoadSettings() m_FontChoice->SetSelection(font); if (m_FontChoice->GetSelection() < (int)LogFont.size()) m_Log->SetDefaultStyle(wxTextAttr(wxNullColour, wxNullColour, LogFont[m_FontChoice->GetSelection()])); - ini.Get("Options", "WriteToFile", &m_writeFile, true); + ini.Get("Options", "WriteToFile", &m_writeFile, false); m_writeFileCB->SetValue(m_writeFile); ini.Get("Options", "WriteToConsole", &m_writeConsole, true); m_writeConsoleCB->SetValue(m_writeConsole); diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp index e1ac9c693e..d591f99900 100644 --- a/Source/Core/VideoCommon/Src/VideoConfig.cpp +++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp @@ -84,7 +84,7 @@ void VideoConfig::Load(const char *ini_file) iniFile.Get("Settings", "ShowShaderErrors", &bShowShaderErrors, 0); iniFile.Get("Settings", "MSAA", &iMultisampleMode, 0); - iniFile.Get("Settings", "EFBScale", &iEFBScale, 0); + iniFile.Get("Settings", "EFBScale", &iEFBScale, 1); // integral iniFile.Get("Settings", "DstAlphaPass", &bDstAlphaPass, false); @@ -98,7 +98,7 @@ void VideoConfig::Load(const char *ini_file) iniFile.Get("Settings", "EnableOpenCL", &bEnableOpenCL, false); iniFile.Get("Enhancements", "ForceFiltering", &bForceFiltering, 0); - iniFile.Get("Enhancements", "MaxAnisotropy", &iMaxAnisotropy, 1); // NOTE - this is x in (1 << x) + iniFile.Get("Enhancements", "MaxAnisotropy", &iMaxAnisotropy, 0); // NOTE - this is x in (1 << x) iniFile.Get("Enhancements", "PostProcessingShader", &sPostProcessingShader, ""); iniFile.Get("Enhancements", "Enable3dVision", &b3DVision, false);