From 40353375aa0e812ed14900552b007dfab2f21a1f Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Fri, 17 Oct 2008 11:43:43 +0200 Subject: Replace configure test for PulseAudio version by cpp test Version 0.9.6 has PA_PROTOCOL_VERSION 10, version 0.9.7 has 11. This simplifies configure and limits the knowledge about PA versions to the audio output plug-in. This time, the patch includes configure.ac, too. --- src/audio_out/audio_pulse_out.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/audio_out/audio_pulse_out.c b/src/audio_out/audio_pulse_out.c index dfae98c31..4b66fbaed 100644 --- a/src/audio_out/audio_pulse_out.c +++ b/src/audio_out/audio_pulse_out.c @@ -218,7 +218,8 @@ static void __xine_pa_sink_info_callback(pa_context *c, const pa_sink_input_info this->cvolume = info->volume; this->swvolume = pa_cvolume_avg(&info->volume); -#ifdef HAVE_PULSEAUDIO_0_9_7 +#if PA_PROTOCOL_VERSION >= 11 + /* PulseAudio 0.9.7 and newer */ this->muted = info->mute; #else this->muted = pa_cvolume_is_muted (&this->cvolume); @@ -665,7 +666,8 @@ static int ao_pulse_set_property (ao_driver_t *this_gen, int property, int value this->muted = value; -#ifdef HAVE_PULSEAUDIO_0_9_7 +#if PA_PROTOCOL_VERSION >= 11 + /* PulseAudio 0.9.7 and newer */ o = pa_context_set_sink_input_mute(this->context, pa_stream_get_index(this->stream), value, __xine_pa_context_success_callback, this); #else -- cgit v1.2.3