Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > fa34babe78cfb34315cd7816d33ba8c7 > files > 5

vlc-1.0.6-2mdv2010.1.src.rpm

--- vlc-1.0.6/modules/audio_output/pulse.c.oldpulse	2009-07-13 14:55:25.000000000 +0200
+++ vlc-1.0.6/modules/audio_output/pulse.c	2009-07-13 14:58:47.000000000 +0200
@@ -239,7 +239,11 @@ static int Open ( vlc_object_t *p_this )
     pa_stream_set_write_callback(p_sys->stream, stream_request_cb, p_aout);
     pa_stream_set_latency_update_callback(p_sys->stream, stream_latency_update_cb, p_aout);
 
+#ifdef PA_STREAM_ADJUST_LATENCY
     if (pa_stream_connect_playback(p_sys->stream, NULL, &a, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE|PA_STREAM_ADJUST_LATENCY, NULL, NULL) < 0) {
+#else
+    if (pa_stream_connect_playback(p_sys->stream, NULL, &a, PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL) < 0) {
+#endif
         msg_Err(p_aout, "Failed to connect stream: %s", pa_strerror(pa_context_errno(p_sys->context)));
         goto unlock_and_fail;
     }
--- vlc-1.0.6/configure.ac.oldpulse	2010-04-18 15:03:54.000000000 +0200
+++ vlc-1.0.6/configure.ac	2010-04-22 16:53:07.000000000 +0200
@@ -4749,7 +4749,7 @@
   [  --enable-pulse          Pulseaudio support (default enabled)])
   if test "${enable_pulse}" != "no"
    then
-     PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.11,
+     PKG_CHECK_MODULES(PULSE, libpulse >= 0.9.10,
        [ VLC_ADD_PLUGIN([pulse])
         VLC_ADD_CFLAGS([pulse],[${PULSE_CFLAGS}])
         VLC_ADD_LDFLAGS([pulse],[${PULSE_LIBS} ${X_LIBS} ${X_PRE_LIBS} -lX11])],