[patch] this patch fixes the previous patch, also from upstream

vlc-0.8.6-pulse-fixes.patch (text/plain), 1.55 KB, created by R Bar-On on 2008-03-29 15:52:31 UTC

--- configure.ac.pulsefixes	2008-02-17 19:23:34.000000000 +0000
+++ configure.ac	2008-02-17 19:31:38.000000000 +0000
@@ -4158,17 +4158,13 @@
 dnl
 AC_ARG_ENABLE(pulse,
   [  --enable-pulse          Pulseaudio support (default disabled)],
-  [
-    if test "x$enable_pulse" != "xno"; then
-    PKG_CHECK_MODULES([PULSEAUDIO], [libpulse], [
-       VLC_ADD_PLUGINS([pulse])
-       VLC_ADD_CFLAGS([pulse],[`pkg-config --cflags libpulse`])
-       VLC_ADD_LIBS([pulse],[`pkg-config --libs libpulse`])
-     ], [
-    AS_IF([test "${enable_pulse}" = "yes"],[
-        AC_MSG_WARN( libpulse not found) 
-       ])
-    ])
+  [if test "${enable_pulse}" = "yes"
+   then
+     PKG_CHECK_MODULES(PULSE, libpulse,
+       [ VLC_ADD_PLUGINS([pulse])
+        VLC_ADD_CFLAGS([pulse],[${PULSE_CFLAGS}])
+        VLC_ADD_LDFLAGS([pulse],[${PULSE_LIBS}])]:,
+       [AC_MSG_WARN(pulsaudio library not found)])
    fi])
 
 dnl
--- modules/audio_output/pulse.c.orig	2008-02-17 19:38:36.000000000 +0000
+++ modules/audio_output/pulse.c	2008-02-17 19:39:13.000000000 +0000
@@ -28,7 +28,8 @@
 #endif
 
 #include <vlc/vlc.h>
-#include <vlc_aout.h>
+#include <vlc/aout.h>
+#include "aout_internal.h"
 
 #include <pulse/pulseaudio.h>
 
@@ -218,6 +218,7 @@
     buffer_attr = pa_stream_get_buffer_attr(p_sys->stream);
     p_aout->output.i_nb_samples = buffer_attr->minreq / pa_frame_size(&ss);
     p_aout->output.pf_play = Play;
+    aout_VolumeSoftInit(p_aout);
     msg_Dbg(p_aout, "Pulse initialized successfully\n");
     {
            char cmt[PA_CHANNEL_MAP_SNPRINT_MAX], sst[PA_SAMPLE_SPEC_SNPRINT_MAX];