From 2c1c538fda491f97a735902e00987537db1d3487 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Thu, 10 Jan 2013 18:43:15 +0100 Subject: Disable the OpenAL and Pulseaudio audio backends They are currently broken and cause sound issues which are not present in other backends: * OpenAL plays music 2x too fast in Zelda UCode games with HLE * Pulse backend uses a lot of CPU power and slows down emulation significantly Both backends are currently being re-implemented in separate branches of Dolphin, so this should be a temporary removal. --- Source/Core/AudioCommon/Src/AudioCommon.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'Source/Core/AudioCommon/Src/AudioCommon.cpp') diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index 8a568448a3..b21aec45ba 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -102,16 +102,12 @@ namespace AudioCommon backends.push_back(BACKEND_DIRECTSOUND); if (XAudio2::isValid()) backends.push_back(BACKEND_XAUDIO2); - if (OpenALStream::isValid()) - backends.push_back(BACKEND_OPENAL); if (AOSound::isValid()) backends.push_back(BACKEND_AOSOUND); if (AlsaSound::isValid()) backends.push_back(BACKEND_ALSA); if (CoreAudioSound::isValid()) backends.push_back(BACKEND_COREAUDIO); - if (PulseAudio::isValid()) - backends.push_back(BACKEND_PULSEAUDIO); return backends; } -- cgit v1.2.3 From 020ab743a90c165e836d4bb3cce57cb60443ad7e Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 13 Jan 2013 22:20:33 -0600 Subject: re-enable PulseAudio backend --- Source/Core/AudioCommon/Src/AudioCommon.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'Source/Core/AudioCommon/Src/AudioCommon.cpp') diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index b21aec45ba..5660edca0a 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -96,18 +96,20 @@ namespace AudioCommon { std::vector backends; - if (NullSound::isValid()) + if (NullSound::isValid()) backends.push_back(BACKEND_NULLSOUND); - if (DSound::isValid()) + if (DSound::isValid()) backends.push_back(BACKEND_DIRECTSOUND); - if (XAudio2::isValid()) + if (XAudio2::isValid()) backends.push_back(BACKEND_XAUDIO2); - if (AOSound::isValid()) + if (AOSound::isValid()) backends.push_back(BACKEND_AOSOUND); - if (AlsaSound::isValid()) + if (AlsaSound::isValid()) backends.push_back(BACKEND_ALSA); - if (CoreAudioSound::isValid()) + if (CoreAudioSound::isValid()) backends.push_back(BACKEND_COREAUDIO); + if (PulseAudio::isValid()) + backends.push_back(BACKEND_PULSEAUDIO); return backends; } -- cgit v1.2.3 From 799b032b98000f2a7ada1a11ab8a001eb0c58882 Mon Sep 17 00:00:00 2001 From: skidau Date: Tue, 15 Jan 2013 23:14:11 +1100 Subject: Readd the OpenAL option. The OpenAL backend requires OpenAL Soft to be installed: http://kcat.strangesoft.net/openal.html You may need to rename soft_oal.dll to OpenAL32.dll in the Dolphin folder. Windows users may also need to update their OpenAL drivers by downloading them from http://connect.creativelabs.com/openal/Downloads/oalinst.zip --- Source/Core/AudioCommon/Src/AudioCommon.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Source/Core/AudioCommon/Src/AudioCommon.cpp') diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index 5660edca0a..99ae42b93a 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -110,6 +110,8 @@ namespace AudioCommon backends.push_back(BACKEND_COREAUDIO); if (PulseAudio::isValid()) backends.push_back(BACKEND_PULSEAUDIO); + if (OpenALStream::isValid()) + backends.push_back(BACKEND_OPENAL); return backends; } -- cgit v1.2.3 From 196c2867adc1f80d1037b0b87e9d99e775cad375 Mon Sep 17 00:00:00 2001 From: Rachel Bryk Date: Wed, 16 Jan 2013 20:16:56 -0500 Subject: Move DSP settings to dolphin.ini --- Source/Core/AudioCommon/Src/AudioCommon.cpp | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'Source/Core/AudioCommon/Src/AudioCommon.cpp') diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index 99ae42b93a..e14b9ac45e 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -27,6 +27,10 @@ #include "OpenALStream.h" #include "PulseAudioStream.h" #include "../../Core/Src/Movie.h" +#include "../../Core/Src/ConfigManager.h" + +// This shouldn't be a global, at least not here. +SoundStream *soundStream; namespace AudioCommon { @@ -34,7 +38,7 @@ namespace AudioCommon { // TODO: possible memleak with mixer - std::string backend = ac_Config.sBackend; + std::string backend = SConfig::GetInstance().sBackend; if (backend == BACKEND_OPENAL && OpenALStream::isValid()) soundStream = new OpenALStream(mixer); else if (backend == BACKEND_NULLSOUND && NullSound::isValid()) @@ -54,10 +58,10 @@ namespace AudioCommon if (soundStream != NULL) { - ac_Config.Update(); + UpdateSoundStream(); if (soundStream->Start()) { - if (ac_Config.m_DumpAudio) + if (SConfig::GetInstance().m_DumpAudio) { std::string audio_file_name = File::GetUserPath(D_DUMPAUDIO_IDX) + "audiodump.wav"; File::CreateFullPath(audio_file_name); @@ -82,7 +86,7 @@ namespace AudioCommon if (soundStream) { soundStream->Stop(); - if (ac_Config.m_DumpAudio) + if (SConfig::GetInstance().m_DumpAudio) soundStream->GetMixer()->StopLogAudio(); //soundStream->StopLogAudio(); delete soundStream; @@ -122,7 +126,7 @@ namespace AudioCommon { return true; } - return ac_Config.m_EnableJIT; + return SConfig::GetInstance().m_EnableJIT; } void PauseAndLock(bool doLock, bool unpauseOnUnlock) @@ -143,4 +147,12 @@ namespace AudioCommon } } } + void UpdateSoundStream() + { + if (soundStream) + { + soundStream->GetMixer()->SetThrottle(SConfig::GetInstance().m_Framelimit == 2); + soundStream->SetVolume(SConfig::GetInstance().m_Volume); + } + } } -- cgit v1.2.3