summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-10-17 00:03:06 +0200
committerLennart Poettering <lennart@poettering.net>2009-10-17 00:12:56 +0200
commitd013d7f83eff2ee030d8e0b455a0a6a786448438 (patch)
treee5834562d45480da518c3b808a485870ab21fdf2
parent98d27997ef22c29fabbebeb36472ef446f61b499 (diff)
pulse: adjust CHECK_DEAD_GOTO macro to glib style
-rw-r--r--ext/pulse/pulsemixerctrl.c15
1 files 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)