pulse: use PA_CONTEXT_IS_GOOD where applicable
PATCH 2/4 pulse: use PA_CONTEXT_IS_GOOD where applicable
PA_CONTEXT_IS_GOOD is a safer way to check whether a context is still valid.
This patch also bumps the version requirement of libpulse to 0.9.11.
--- configure.in | 2 +- pulse/pulse.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-)
configure.in +1 -1
@@ -30,7 +30,7 @@ AC_ARG_ENABLE([pulseaudio], AS_HELP_STRING([--disable-pulseaudio], [Disable building of pulseaudio plugin])) if test "x$enable_pulseaudio" != "xno"; then - PKG_CHECK_MODULES(pulseaudio, [libpulse >= 0.9.2], [HAVE_PULSE=yes], [HAVE_PULSE=no]) + PKG_CHECK_MODULES(pulseaudio, [libpulse >= 0.9.11], [HAVE_PULSE=yes], [HAVE_PULSE=no]) fi AM_CONDITIONAL(HAVE_PULSE, test x$HAVE_PULSE = xyes)
pulse/pulse.c +2 -3
@@ -38,7 +38,7 @@ int pulse_check_connection(snd_pulse_t * p) state =pa_context_get_state (p->context); -if (state !=PA_CONTEXT_READY ) +if (!PA_CONTEXT_IS_GOOD (state))return -EIO ;return 0 ;
@@ -127,8 +127,7 @@ int pulse_wait_stream_state(snd_pulse_t * p, pa_stream * stream,if (state == target)break ; -if (state ==PA_STREAM_FAILED || - state ==PA_STREAM_TERMINATED ) +if (!PA_STREAM_IS_GOOD (state))return -EIO ;pa_threaded_mainloop_wait (p->mainloop);
Signature · 10 lines
1.6.3.3 Lennart -- Lennart Poettering Red Hat, Inc. lennart [at] poettering [dot] net ICQ# 11060553 http://0pointer.net/lennart/ GnuPG 0x1A015CC4