pulsesink: don't do logic within g_assert() statements
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Sat, 1 Aug 2009 20:39:30 +0000 (21:39 +0100)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Sun, 2 Aug 2009 10:49:17 +0000 (11:49 +0100)
Otherwise that code will just be expanded to nothing when compiled
-DG_DISABLE_ASSERT (PS: why is mainloop_start() called in the init
function and not when changing state to READY?)

ext/pulse/pulsesink.c

index 9839129..0b91064 100644 (file)
@@ -1553,6 +1553,8 @@ server_dead:
 static void
 gst_pulsesink_init (GstPulseSink * pulsesink, GstPulseSinkClass * klass)
 {
+  guint res;
+
   pulsesink->server = NULL;
   pulsesink->device = NULL;
   pulsesink->device_description = NULL;
@@ -1568,8 +1570,10 @@ gst_pulsesink_init (GstPulseSink * pulsesink, GstPulseSinkClass * klass)
   GST_DEBUG_OBJECT (pulsesink, "using pulseaudio version %s",
       pulsesink->pa_version);
 
-  g_assert ((pulsesink->mainloop = pa_threaded_mainloop_new ()));
-  g_assert (pa_threaded_mainloop_start (pulsesink->mainloop) == 0);
+  pulsesink->mainloop = pa_threaded_mainloop_new ();
+  g_assert (pulsesink->mainloop != NULL);
+  res = pa_threaded_mainloop_start (pulsesink->mainloop);
+  g_assert (res == 0);
 
   /* TRUE for sinks, FALSE for sources */
   pulsesink->probe = gst_pulseprobe_new (G_OBJECT (pulsesink),