summaryrefslogtreecommitdiff
path: root/Source/Core/AudioCommon/Src/AudioCommon.cpp
diff options
context:
space:
mode:
authornakeee <nakeee@gmail.com>2009-10-15 17:28:23 +0000
committernakeee <nakeee@gmail.com>2009-10-15 17:28:23 +0000
commit5834fa67107d95723bc6ca2cb237ae7a58062e1e (patch)
treeac491e4ae0bbd65a1c9d6c222046dc5697358d04 /Source/Core/AudioCommon/Src/AudioCommon.cpp
parenta05fbd852533e18b6809e8f6cc73c139a7ad7503 (diff)
Pulse audio empty struct implementation. Working on it though
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4428 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/AudioCommon/Src/AudioCommon.cpp')
-rw-r--r--Source/Core/AudioCommon/Src/AudioCommon.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp
index 079077305c..1bea5458ff 100644
--- a/Source/Core/AudioCommon/Src/AudioCommon.cpp
+++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp
@@ -23,6 +23,7 @@
#include "NullSoundStream.h"
#include "CoreAudioSoundStream.h"
#include "OpenALStream.h"
+#include "PulseAudioStream.h"
namespace AudioCommon
{
@@ -43,6 +44,8 @@ namespace AudioCommon
soundStream = new OpenALStream(mixer);
if (backend == BACKEND_ALSA && AlsaSound::isValid())
soundStream = new AlsaSound(mixer);
+ if (backend == BACKEND_PULSEAUDIO && PulseAudio::isValid())
+ soundStream = new PulseAudio(mixer);
if (backend == BACKEND_NULL && NullSound::isValid())
soundStream = new NullSound(mixer);
@@ -101,6 +104,8 @@ namespace AudioCommon
backends.push_back(BACKEND_OPENAL);
if (AlsaSound::isValid())
backends.push_back(BACKEND_ALSA);
+ if (PulseAudio::isValid())
+ backends.push_back(BACKEND_PULSEAUDIO);
if (NullSound::isValid())
backends.push_back(BACKEND_NULL);