[PATCH] openal-soft: prefer pulseaudio backend

While toying with pulseaudio I noticed openal-soft now gained native
support in recent git versions. openal-soft however uses alsa by
default which doesn't seem to make sense. On "perfect"[1] pulseaudio
installations an alsa plugins reroutes sound to pulseaudio.
Therefore openal-soft would always use that emulation mode instead
of native support. So preferring pulseaudio by default but not
causing the pulseaudio daemon to start automatically is the better
choice IMHO.

[1] http://www.pulseaudio.org/wiki/PerfectSetup

Signed-off-by: Ludwig Nussel <ludwig.nussel@...>

---
 Alc/ALc.c        |    6 +++---
 Alc/pulseaudio.c |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Alc/ALc.c b/Alc/ALc.c
index 749e1d4..4e6ff88 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -53,6 +53,9 @@ static struct {
     void (*Init)(BackendFuncs*);
     BackendFuncs Funcs;
 } BackendList[] = {
+#ifdef HAVE_PULSEAUDIO
+    { "pulse", alc_pulse_init, EmptyFuncs },
+#endif
 #ifdef HAVE_ALSA
     { "alsa", alc_alsa_init, EmptyFuncs },
 #endif
@@ -71,9 +74,6 @@ static struct {
 #ifdef HAVE_PORTAUDIO
     { "port", alc_pa_init, EmptyFuncs },
 #endif
-#ifdef HAVE_PULSEAUDIO
-    { "pulse", alc_pulse_init, EmptyFuncs },
-#endif
 
     { "wave", alc_wave_init, EmptyFuncs },
 
diff --git a/Alc/pulseaudio.c b/Alc/pulseaudio.c
index 85a8276..6ba0255 100644
--- a/Alc/pulseaudio.c
+++ b/Alc/pulseaudio.c
@@ -250,7 +250,7 @@ static ALCboolean pulse_open(ALCdevice *device, ALCchar *device_name, ALCenum fo
 
     pa_context_set_state_callback(data->context, context_state_callback, data);
 
-    if(pa_context_connect(data->context, NULL, 0, NULL) < 0)
+    if(pa_context_connect(data->context, NULL, PA_CONTEXT_NOAUTOSPAWN, NULL) < 0)
     {
         AL_PRINT("Context did not connect: %s\n",
                  pa_strerror(pa_context_errno(data->context)));
--
1.6.2.1

_______________________________________________
Openal-devel mailing list
Openal-devel@...
http://opensource.creative.com/mailman/listinfo/openal-devel