From d013d7f83eff2ee030d8e0b455a0a6a786448438 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 17 Oct 2009 00:03:06 +0200 Subject: pulse: adjust CHECK_DEAD_GOTO macro to glib style --- ext/pulse/pulsemixerctrl.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ext/pulse/pulsemixerctrl.c b/ext/pulse/pulsemixerctrl.c index cd3c8e24..8df08407 100644 --- a/ext/pulse/pulsemixerctrl.c +++ b/ext/pulse/pulsemixerctrl.c @@ -199,12 +199,15 @@ gst_pulsemixer_ctrl_success_cb (pa_context * context, int success, pa_threaded_mainloop_signal (c->mainloop, 0); } -#define CHECK_DEAD_GOTO(c, label) do { \ -if (!(c)->context || pa_context_get_state((c)->context) != PA_CONTEXT_READY) { \ - GST_WARNING_OBJECT (c->object, "Not connected: %s", (c)->context ? pa_strerror(pa_context_errno((c)->context)) : "NULL"); \ - goto label; \ -} \ -} while(0); +#define CHECK_DEAD_GOTO(c, label) \ + G_STMT_START { \ + if (!(c)->context || \ + !PA_CONTEXT_IS_GOOD(pa_context_get_state((c)->context))) { \ + GST_WARNING_OBJECT ((c)->object, "Not connected: %s", \ + (c)->context ? pa_strerror(pa_context_errno((c)->context)) : "NULL"); \ + goto label; \ + } \ + } G_STMT_END static gboolean gst_pulsemixer_ctrl_open (GstPulseMixerCtrl * c) -- cgit