From a9ffdb5b47ff5801c5e91dff80f62c539e0581f7 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Mon, 16 Nov 2009 22:07:31 +0200 Subject: [PATCH] ladspa: only use g_return_val_if_fail for checking pre-conditions g_return_* can be disabled. Still we want to check for failed instance creation. --- ext/ladspa/gstladspa.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c index 7514498..4b9b5b1 100644 --- a/ext/ladspa/gstladspa.c +++ b/ext/ladspa/gstladspa.c @@ -578,9 +578,8 @@ gst_ladspa_setup (GstSignalProcessor * gsp, GstCaps * caps) GST_DEBUG_OBJECT (ladspa, "instantiating the plugin at %d Hz", sample_rate); - ladspa->handle = desc->instantiate (desc, sample_rate); - - g_return_val_if_fail (ladspa->handle != NULL, FALSE); + if (!(ladspa->handle = desc->instantiate (desc, sample_rate))) + goto no_instance; /* connect the control ports */ for (i = 0; i < gsp_class->num_control_in; i++) @@ -597,6 +596,11 @@ no_sample_rate: GST_WARNING_OBJECT (gsp, "got no sample-rate"); return FALSE; } +no_instance: + { + GST_WARNING_OBJECT (gsp, "could not create instance"); + return FALSE; + } } static gboolean -- 2.7.4