diff options
| author | skidau <skidau@gmail.com> | 2013-08-23 12:15:39 +1000 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2013-08-23 12:15:39 +1000 |
| commit | 1f3a0ff10baa5fb0baf4085bd44149d864fe97ab (patch) | |
| tree | 7a3992ca4f68132ec5c3d635e098cf9f93a836a7 /Source/Core | |
| parent | a5613f5c103f5dc5836eb98047ac82d4bad2e658 (diff) | |
| parent | c774fb488021a7640b24532d9f6cbdd41086fb56 (diff) | |
Merge branch 'OpenAL-sane-defaults'
* OpenAL-sane-defaults:
Removed a redundant tooltip text.
Changed the default audio latency to 2. Made soft_oal.dll the default on Windows builds as the old OpenAL32.dll is outdated and contains bugs.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/ConfigManager.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/ConfigMain.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Source/Core/Core/Src/ConfigManager.cpp b/Source/Core/Core/Src/ConfigManager.cpp index bff6665bc1..f226aa8aa2 100644 --- a/Source/Core/Core/Src/ConfigManager.cpp +++ b/Source/Core/Core/Src/ConfigManager.cpp @@ -396,7 +396,7 @@ void SConfig::LoadSettings() ini.Get("Core", "EnableCheats", &m_LocalCoreStartupParameter.bEnableCheats, false); ini.Get("Core", "SelectedLanguage", &m_LocalCoreStartupParameter.SelectedLanguage, 0); ini.Get("Core", "DPL2Decoder", &m_LocalCoreStartupParameter.bDPL2Decoder, false); - ini.Get("Core", "Latency", &m_LocalCoreStartupParameter.iLatency, 14); + ini.Get("Core", "Latency", &m_LocalCoreStartupParameter.iLatency, 2); ini.Get("Core", "MemcardA", &m_strMemoryCardA); ini.Get("Core", "MemcardB", &m_strMemoryCardB); ini.Get("Core", "SlotA", (int*)&m_EXIDevice[0], EXIDEVICE_MEMORYCARD); diff --git a/Source/Core/DolphinWX/Src/ConfigMain.cpp b/Source/Core/DolphinWX/Src/ConfigMain.cpp index 4ae51d78a1..e9da722739 100644 --- a/Source/Core/DolphinWX/Src/ConfigMain.cpp +++ b/Source/Core/DolphinWX/Src/ConfigMain.cpp @@ -513,10 +513,8 @@ void CConfigMain::InitializeGUITooltips() #if defined(__APPLE__) DPL2Decoder->SetToolTip(_("Enables Dolby Pro Logic II emulation using 5.1 surround. Not available on OSX.")); -#elif defined(__linux__) +#else DPL2Decoder->SetToolTip(_("Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only.")); -#elif defined(_WIN32) - DPL2Decoder->SetToolTip(_("Enables Dolby Pro Logic II emulation using 5.1 surround. OpenAL backend only. May need to rename soft_oal.dll to OpenAL32.dll to make it work.")); #endif Latency->SetToolTip(_("Sets the latency (in ms). Higher values may reduce audio crackling. OpenAL backend only.")); |