diff options
| author | Matthias Ringwald <mringwal@inf.ethz.ch> | 2008-10-17 11:43:43 +0200 |
|---|---|---|
| committer | Matthias Ringwald <mringwal@inf.ethz.ch> | 2008-10-17 11:43:43 +0200 |
| commit | 40353375aa0e812ed14900552b007dfab2f21a1f (patch) | |
| tree | 69dba7f9e7e8b6af6047687fd931394920418371 /src | |
| parent | 15b13174d39eac2b4473390fbb9c1c4b39d67eda (diff) | |
| download | xine-lib-40353375aa0e812ed14900552b007dfab2f21a1f.tar.gz xine-lib-40353375aa0e812ed14900552b007dfab2f21a1f.tar.bz2 | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/audio_out/audio_pulse_out.c | 6 |
1 files changed, 4 insertions, 2 deletions
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 |