From 020ab743a90c165e836d4bb3cce57cb60443ad7e Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sun, 13 Jan 2013 22:20:33 -0600 Subject: [PATCH] re-enable PulseAudio backend --- Source/Core/AudioCommon/Src/AudioCommon.cpp | 14 ++++++++------ Source/Core/AudioCommon/Src/PulseAudioStream.cpp | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) 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; } diff --git a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp index 923a338190..faa94c22e0 100644 --- a/Source/Core/AudioCommon/Src/PulseAudioStream.cpp +++ b/Source/Core/AudioCommon/Src/PulseAudioStream.cpp @@ -77,7 +77,7 @@ bool PulseAudio::PulseInit() pa_sample_spec ss = {}; ss.format = PA_SAMPLE_S16LE; ss.channels = 2; - ss.rate = m_mixer->GetSampleRate(); + ss.rate = m_mixer->GetSampleRate(); int error; pa = pa_simple_new(nullptr, "dolphin-emu", PA_STREAM_PLAYBACK,