re-enable PulseAudio backend

This commit is contained in:
Jordan Woyak 2013-01-13 22:20:33 -06:00
parent 13469f2db4
commit 020ab743a9
2 changed files with 9 additions and 7 deletions

View File

@ -96,18 +96,20 @@ namespace AudioCommon
{ {
std::vector<std::string> backends; std::vector<std::string> backends;
if (NullSound::isValid()) if (NullSound::isValid())
backends.push_back(BACKEND_NULLSOUND); backends.push_back(BACKEND_NULLSOUND);
if (DSound::isValid()) if (DSound::isValid())
backends.push_back(BACKEND_DIRECTSOUND); backends.push_back(BACKEND_DIRECTSOUND);
if (XAudio2::isValid()) if (XAudio2::isValid())
backends.push_back(BACKEND_XAUDIO2); backends.push_back(BACKEND_XAUDIO2);
if (AOSound::isValid()) if (AOSound::isValid())
backends.push_back(BACKEND_AOSOUND); backends.push_back(BACKEND_AOSOUND);
if (AlsaSound::isValid()) if (AlsaSound::isValid())
backends.push_back(BACKEND_ALSA); backends.push_back(BACKEND_ALSA);
if (CoreAudioSound::isValid()) if (CoreAudioSound::isValid())
backends.push_back(BACKEND_COREAUDIO); backends.push_back(BACKEND_COREAUDIO);
if (PulseAudio::isValid())
backends.push_back(BACKEND_PULSEAUDIO);
return backends; return backends;
} }

View File

@ -77,7 +77,7 @@ bool PulseAudio::PulseInit()
pa_sample_spec ss = {}; pa_sample_spec ss = {};
ss.format = PA_SAMPLE_S16LE; ss.format = PA_SAMPLE_S16LE;
ss.channels = 2; ss.channels = 2;
ss.rate = m_mixer->GetSampleRate(); ss.rate = m_mixer->GetSampleRate();
int error; int error;
pa = pa_simple_new(nullptr, "dolphin-emu", PA_STREAM_PLAYBACK, pa = pa_simple_new(nullptr, "dolphin-emu", PA_STREAM_PLAYBACK,