gst-indent

Original commit message from CVS:
gst-indent

5 files changed, 572 insertions, 557 deletions

diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c
index 020767fa..4f6c1f0c 100644
--- a/ext/ladspa/gstladspa.c
+++ b/ext/ladspa/gstladspa.c
@@ -28,8 +28,8 @@
 #include <gst/audio/audio.h>
 
 #include "gstladspa.h"
-#include <ladspa.h>     /* main ladspa sdk include file */
-#include "utils.h"      /* ladspa sdk utility functions */
+#include <ladspa.h>		/* main ladspa sdk include file */
+#include "utils.h"		/* ladspa sdk utility functions */
 
 /* 1.0 and the 1.1 preliminary headers don't define a version, but 1.1 final
    does */
@@ -40,31 +40,34 @@
 static GstStaticCaps ladspa_pad_caps =
 GST_STATIC_CAPS (GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_CAPS);
 
-static void			gst_ladspa_class_init		(GstLADSPAClass *klass);
-static void			gst_ladspa_base_init		(GstLADSPAClass *klass);
-static void			gst_ladspa_init			(GstLADSPA *ladspa);
+static void gst_ladspa_class_init (GstLADSPAClass * klass);
+static void gst_ladspa_base_init (GstLADSPAClass * klass);
+static void gst_ladspa_init (GstLADSPA * ladspa);
 
-static void			gst_ladspa_update_int		(const GValue *value, gpointer data);
-static GstPadLinkReturn		gst_ladspa_link			(GstPad *pad, const GstCaps *caps);
+static void gst_ladspa_update_int (const GValue * value, gpointer data);
+static GstPadLinkReturn gst_ladspa_link (GstPad * pad, const GstCaps * caps);
 
-static void			gst_ladspa_set_property		(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void			gst_ladspa_get_property		(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void gst_ladspa_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_ladspa_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
 
-static gboolean			gst_ladspa_instantiate		(GstLADSPA *ladspa);
-static void			gst_ladspa_activate		(GstLADSPA *ladspa);
-static void			gst_ladspa_deactivate		(GstLADSPA *ladspa);
+static gboolean gst_ladspa_instantiate (GstLADSPA * ladspa);
+static void gst_ladspa_activate (GstLADSPA * ladspa);
+static void gst_ladspa_deactivate (GstLADSPA * ladspa);
 
-static GstElementStateReturn	gst_ladspa_change_state		(GstElement *element);
-static void			gst_ladspa_loop			(GstElement *element);
-static void			gst_ladspa_chain		(GstPad *pad,GstData *_data);
-static GstData *		gst_ladspa_get			(GstPad *pad);
+static GstElementStateReturn gst_ladspa_change_state (GstElement * element);
+static void gst_ladspa_loop (GstElement * element);
+static void gst_ladspa_chain (GstPad * pad, GstData * _data);
+static GstData *gst_ladspa_get (GstPad * pad);
 
 static GstElementClass *parent_class = NULL;
 
 static GstPlugin *ladspa_plugin;
 static GHashTable *ladspa_descriptors;
 
-enum {
+enum
+{
   ARG_0,
   ARG_SAMPLERATE,
   ARG_BUFFERSIZE,
@@ -78,38 +81,39 @@ GST_DEBUG_CATEGORY_STATIC (ladspa_debug);
     GST_CAT_LEVEL_LOG (ladspa_debug, GST_LEVEL_DEBUG, obj, __VA_ARGS__)
 
 static void
-gst_ladspa_base_init (GstLADSPAClass *klass)
+gst_ladspa_base_init (GstLADSPAClass * klass)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
   GstPadTemplate *templ;
   GstElementDetails *details;
   LADSPA_Descriptor *desc;
-  gint j, sinkcount,srccount;
+  gint j, sinkcount, srccount;
 
-  desc = g_hash_table_lookup(ladspa_descriptors,
-		GINT_TO_POINTER(G_TYPE_FROM_CLASS(klass)));
+  desc = g_hash_table_lookup (ladspa_descriptors,
+      GINT_TO_POINTER (G_TYPE_FROM_CLASS (klass)));
   if (!desc)
-    desc = g_hash_table_lookup(ladspa_descriptors, GINT_TO_POINTER(0));
+    desc = g_hash_table_lookup (ladspa_descriptors, GINT_TO_POINTER (0));
   g_assert (desc);
 
   /* pad templates */
   klass->numports = desc->PortCount;
   klass->numsinkpads = 0;
   klass->numsrcpads = 0;
-  for (j=0;j<desc->PortCount;j++) {
-    if (LADSPA_IS_PORT_AUDIO(desc->PortDescriptors[j])) {
-      gchar *name = g_strdup((gchar *)desc->PortNames[j]);
+  for (j = 0; j < desc->PortCount; j++) {
+    if (LADSPA_IS_PORT_AUDIO (desc->PortDescriptors[j])) {
+      gchar *name = g_strdup ((gchar *) desc->PortNames[j]);
+
       g_strcanon (name, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-');
 
       /* the factories take ownership of the name */
-      if (LADSPA_IS_PORT_INPUT(desc->PortDescriptors[j])) {
-        templ = gst_pad_template_new (name, GST_PAD_SINK, GST_PAD_ALWAYS,
-            gst_caps_copy (gst_static_caps_get (&ladspa_pad_caps)));
-        klass->numsinkpads++;
+      if (LADSPA_IS_PORT_INPUT (desc->PortDescriptors[j])) {
+	templ = gst_pad_template_new (name, GST_PAD_SINK, GST_PAD_ALWAYS,
+	    gst_caps_copy (gst_static_caps_get (&ladspa_pad_caps)));
+	klass->numsinkpads++;
       } else {
-        templ = gst_pad_template_new (name, GST_PAD_SRC, GST_PAD_ALWAYS,
-            gst_caps_copy (gst_static_caps_get (&ladspa_pad_caps)));
-        klass->numsrcpads++;
+	templ = gst_pad_template_new (name, GST_PAD_SRC, GST_PAD_ALWAYS,
+	    gst_caps_copy (gst_static_caps_get (&ladspa_pad_caps)));
+	klass->numsrcpads++;
       }
 
       gst_element_class_add_pad_template (element_class, templ);
@@ -117,28 +121,32 @@ gst_ladspa_base_init (GstLADSPAClass *klass)
   }
 
   /* construct the element details struct */
-  details = g_new0(GstElementDetails,1);
-  details->longname = g_strdup(desc->Name);
+  details = g_new0 (GstElementDetails, 1);
+  details->longname = g_strdup (desc->Name);
   details->description = details->longname;
-  details->author = g_strdup(desc->Maker);
-  if     ((klass->numsinkpads >0) && (klass->numsrcpads >0)) details->klass = "Filter/Effect/Audio/LADSPA";
-  else if((klass->numsinkpads==0) && (klass->numsrcpads >0)) details->klass = "Source/Audio/LADSPA";
-  else if((klass->numsinkpads >0) && (klass->numsrcpads==0)) details->klass = "Sink/Audio/LADSPA";
-  else details->klass = "Filter/Effect/Audio/LADSPA"; /* whatever this is */
+  details->author = g_strdup (desc->Maker);
+  if ((klass->numsinkpads > 0) && (klass->numsrcpads > 0))
+    details->klass = "Filter/Effect/Audio/LADSPA";
+  else if ((klass->numsinkpads == 0) && (klass->numsrcpads > 0))
+    details->klass = "Source/Audio/LADSPA";
+  else if ((klass->numsinkpads > 0) && (klass->numsrcpads == 0))
+    details->klass = "Sink/Audio/LADSPA";
+  else
+    details->klass = "Filter/Effect/Audio/LADSPA";	/* whatever this is */
   gst_element_class_set_details (element_class, details);
 
-  klass->srcpad_portnums = g_new0(gint,klass->numsrcpads);
-  klass->sinkpad_portnums = g_new0(gint,klass->numsinkpads);
+  klass->srcpad_portnums = g_new0 (gint, klass->numsrcpads);
+  klass->sinkpad_portnums = g_new0 (gint, klass->numsinkpads);
   sinkcount = 0;
   srccount = 0;
 
   /* walk through the ports, note the portnums for srcpads, sinkpads */
-  for (j=0; j<desc->PortCount; j++) {
-    if (LADSPA_IS_PORT_AUDIO(desc->PortDescriptors[j])) {
-      if (LADSPA_IS_PORT_INPUT(desc->PortDescriptors[j]))
-        klass->sinkpad_portnums[sinkcount++] = j;
+  for (j = 0; j < desc->PortCount; j++) {
+    if (LADSPA_IS_PORT_AUDIO (desc->PortDescriptors[j])) {
+      if (LADSPA_IS_PORT_INPUT (desc->PortDescriptors[j]))
+	klass->sinkpad_portnums[sinkcount++] = j;
       else
-        klass->srcpad_portnums[srccount++] = j;
+	klass->srcpad_portnums[srccount++] = j;
     }
   }
 
@@ -146,19 +154,19 @@ gst_ladspa_base_init (GstLADSPAClass *klass)
 }
 
 static void
-gst_ladspa_class_init (GstLADSPAClass *klass)
+gst_ladspa_class_init (GstLADSPAClass * klass)
 {
   GObjectClass *gobject_class;
   GstElementClass *gstelement_class;
   LADSPA_Descriptor *desc;
-  gint i,current_portnum,controlcount;
+  gint i, current_portnum, controlcount;
   gint hintdesc;
-  gint argtype,argperms;
+  gint argtype, argperms;
   GParamSpec *paramspec = NULL;
   gchar *argname, *tempstr, *paren;
 
-  gobject_class = (GObjectClass*)klass;
-  gstelement_class = (GstElementClass*)klass;
+  gobject_class = (GObjectClass *) klass;
+  gstelement_class = (GstElementClass *) klass;
 
   gobject_class->set_property = gst_ladspa_set_property;
   gobject_class->get_property = gst_ladspa_get_property;
@@ -166,78 +174,85 @@ gst_ladspa_class_init (GstLADSPAClass *klass)
   gstelement_class->change_state = gst_ladspa_change_state;
 
   /* look up and store the ladspa descriptor */
-  desc = g_hash_table_lookup(ladspa_descriptors,
-		GINT_TO_POINTER(G_TYPE_FROM_CLASS(klass)));
+  desc = g_hash_table_lookup (ladspa_descriptors,
+      GINT_TO_POINTER (G_TYPE_FROM_CLASS (klass)));
   if (!desc)
-    desc = g_hash_table_lookup(ladspa_descriptors, GINT_TO_POINTER(0));
+    desc = g_hash_table_lookup (ladspa_descriptors, GINT_TO_POINTER (0));
   g_assert (desc);
 
   klass->numcontrols = 0;
 
   /* walk through the ports, count the input, output and control ports */
-  for (i=0; i<desc->PortCount; i++) {
-    if (!LADSPA_IS_PORT_AUDIO(desc->PortDescriptors[i]) &&
-        LADSPA_IS_PORT_INPUT(desc->PortDescriptors[i]))
+  for (i = 0; i < desc->PortCount; i++) {
+    if (!LADSPA_IS_PORT_AUDIO (desc->PortDescriptors[i]) &&
+	LADSPA_IS_PORT_INPUT (desc->PortDescriptors[i]))
       klass->numcontrols++;
   }
 
   DEBUG ("ladspa element class: init %s with %d sink, %d src, %d control\n",
-         g_type_name (G_TYPE_FROM_CLASS (klass)),
-         klass->numsinkpads, klass->numsrcpads, klass->numcontrols);
+      g_type_name (G_TYPE_FROM_CLASS (klass)),
+      klass->numsinkpads, klass->numsrcpads, klass->numcontrols);
 
-  klass->control_portnums = g_new0(gint,klass->numcontrols);
+  klass->control_portnums = g_new0 (gint, klass->numcontrols);
   controlcount = 0;
 
   /* walk through the ports, note the portnums for control params */
-  for (i=0; i<desc->PortCount; i++) {
-    if (!LADSPA_IS_PORT_AUDIO(desc->PortDescriptors[i]) &&
-        LADSPA_IS_PORT_INPUT(desc->PortDescriptors[i]))
+  for (i = 0; i < desc->PortCount; i++) {
+    if (!LADSPA_IS_PORT_AUDIO (desc->PortDescriptors[i]) &&
+	LADSPA_IS_PORT_INPUT (desc->PortDescriptors[i]))
       klass->control_portnums[controlcount++] = i;
   }
 
   /* now build the control info from the control ports */
-  klass->control_info = g_new0(ladspa_control_info,klass->numcontrols);
-    
-  for (i=0;i<klass->numcontrols;i++) {
+  klass->control_info = g_new0 (ladspa_control_info, klass->numcontrols);
+
+  for (i = 0; i < klass->numcontrols; i++) {
     current_portnum = klass->control_portnums[i];
-    
+
     /* short name for hint descriptor */
     hintdesc = desc->PortRangeHints[current_portnum].HintDescriptor;
 
     /* get the various bits */
-    if (LADSPA_IS_HINT_TOGGLED(hintdesc))
+    if (LADSPA_IS_HINT_TOGGLED (hintdesc))
       klass->control_info[i].toggled = TRUE;
-    if (LADSPA_IS_HINT_LOGARITHMIC(hintdesc))
+    if (LADSPA_IS_HINT_LOGARITHMIC (hintdesc))
       klass->control_info[i].logarithmic = TRUE;
-    if (LADSPA_IS_HINT_INTEGER(hintdesc))
+    if (LADSPA_IS_HINT_INTEGER (hintdesc))
       klass->control_info[i].integer = TRUE;
 
     /* figure out the argument details */
-    if (klass->control_info[i].toggled) argtype = G_TYPE_BOOLEAN;
-    else if (klass->control_info[i].integer) argtype = G_TYPE_INT;
-    else argtype = G_TYPE_FLOAT;
+    if (klass->control_info[i].toggled)
+      argtype = G_TYPE_BOOLEAN;
+    else if (klass->control_info[i].integer)
+      argtype = G_TYPE_INT;
+    else
+      argtype = G_TYPE_FLOAT;
 
     /* grab the bounds */
-    if (LADSPA_IS_HINT_BOUNDED_BELOW(hintdesc)) {
+    if (LADSPA_IS_HINT_BOUNDED_BELOW (hintdesc)) {
       klass->control_info[i].lower = TRUE;
       klass->control_info[i].lowerbound =
-        desc->PortRangeHints[current_portnum].LowerBound;
+	  desc->PortRangeHints[current_portnum].LowerBound;
     } else {
-      if (argtype==G_TYPE_INT) klass->control_info[i].lowerbound = (gfloat)G_MININT;
-      if (argtype==G_TYPE_FLOAT) klass->control_info[i].lowerbound = -G_MAXFLOAT;
+      if (argtype == G_TYPE_INT)
+	klass->control_info[i].lowerbound = (gfloat) G_MININT;
+      if (argtype == G_TYPE_FLOAT)
+	klass->control_info[i].lowerbound = -G_MAXFLOAT;
     }
-    
-    if (LADSPA_IS_HINT_BOUNDED_ABOVE(hintdesc)) {
+
+    if (LADSPA_IS_HINT_BOUNDED_ABOVE (hintdesc)) {
       klass->control_info[i].upper = TRUE;
       klass->control_info[i].upperbound =
-        desc->PortRangeHints[current_portnum].UpperBound;
-      if (LADSPA_IS_HINT_SAMPLE_RATE(hintdesc)) {
-        klass->control_info[i].samplerate = TRUE;
-        klass->control_info[i].upperbound *= 44100; /* FIXME? */
+	  desc->PortRangeHints[current_portnum].UpperBound;
+      if (LADSPA_IS_HINT_SAMPLE_RATE (hintdesc)) {
+	klass->control_info[i].samplerate = TRUE;
+	klass->control_info[i].upperbound *= 44100;	/* FIXME? */
       }
     } else {
-      if (argtype==G_TYPE_INT) klass->control_info[i].upperbound = (gfloat)G_MAXINT;
-      if (argtype==G_TYPE_FLOAT) klass->control_info[i].upperbound = G_MAXFLOAT;
+      if (argtype == G_TYPE_INT)
+	klass->control_info[i].upperbound = (gfloat) G_MAXINT;
+      if (argtype == G_TYPE_FLOAT)
+	klass->control_info[i].upperbound = G_MAXFLOAT;
     }
 
     /* use the lowerbound as the default value */
@@ -247,46 +262,51 @@ gst_ladspa_class_init (GstLADSPAClass *klass)
     /* figure out the defaults */
     if (LADSPA_IS_HINT_HAS_DEFAULT (hintdesc)) {
       if (LADSPA_IS_HINT_DEFAULT_MINIMUM (hintdesc))
-        klass->control_info[i].def = klass->control_info[i].lowerbound;
+	klass->control_info[i].def = klass->control_info[i].lowerbound;
       else if (LADSPA_IS_HINT_DEFAULT_LOW (hintdesc))
-        if (LADSPA_IS_HINT_LOGARITHMIC (hintdesc))
-          klass->control_info[i].def = exp (0.75*log(klass->control_info[i].lowerbound) +
-                                                0.25*log(klass->control_info[i].upperbound));
-        else
-          klass->control_info[i].def = (0.75*klass->control_info[i].lowerbound +
-                                            0.25*klass->control_info[i].upperbound);
+	if (LADSPA_IS_HINT_LOGARITHMIC (hintdesc))
+	  klass->control_info[i].def =
+	      exp (0.75 * log (klass->control_info[i].lowerbound) +
+	      0.25 * log (klass->control_info[i].upperbound));
+	else
+	  klass->control_info[i].def =
+	      (0.75 * klass->control_info[i].lowerbound +
+	      0.25 * klass->control_info[i].upperbound);
       else if (LADSPA_IS_HINT_DEFAULT_MIDDLE (hintdesc))
-        if (LADSPA_IS_HINT_LOGARITHMIC (hintdesc))
-          klass->control_info[i].def = exp (0.5*log(klass->control_info[i].lowerbound) +
-                                                0.5*log(klass->control_info[i].upperbound));
-        else
-          klass->control_info[i].def = (0.5*klass->control_info[i].lowerbound +
-                                            0.5*klass->control_info[i].upperbound);
+	if (LADSPA_IS_HINT_LOGARITHMIC (hintdesc))
+	  klass->control_info[i].def =
+	      exp (0.5 * log (klass->control_info[i].lowerbound) +
+	      0.5 * log (klass->control_info[i].upperbound));
+	else
+	  klass->control_info[i].def =
+	      (0.5 * klass->control_info[i].lowerbound +
+	      0.5 * klass->control_info[i].upperbound);
       else if (LADSPA_IS_HINT_DEFAULT_HIGH (hintdesc))
-        if (LADSPA_IS_HINT_LOGARITHMIC (hintdesc))
-          klass->control_info[i].def = exp (0.25*log(klass->control_info[i].lowerbound) +
-                                                0.75*log(klass->control_info[i].upperbound));
-        else
-          klass->control_info[i].def = (0.25*klass->control_info[i].lowerbound +
-                                            0.75*klass->control_info[i].upperbound);
+	if (LADSPA_IS_HINT_LOGARITHMIC (hintdesc))
+	  klass->control_info[i].def =
+	      exp (0.25 * log (klass->control_info[i].lowerbound) +
+	      0.75 * log (klass->control_info[i].upperbound));
+	else
+	  klass->control_info[i].def =
+	      (0.25 * klass->control_info[i].lowerbound +
+	      0.75 * klass->control_info[i].upperbound);
       else if (LADSPA_IS_HINT_DEFAULT_MAXIMUM (hintdesc))
-        klass->control_info[i].def = klass->control_info[i].upperbound;
+	klass->control_info[i].def = klass->control_info[i].upperbound;
       else if (LADSPA_IS_HINT_DEFAULT_0 (hintdesc))
-        klass->control_info[i].def = 0.0;
+	klass->control_info[i].def = 0.0;
       else if (LADSPA_IS_HINT_DEFAULT_1 (hintdesc))
-        klass->control_info[i].def = 1.0;
+	klass->control_info[i].def = 1.0;
       else if (LADSPA_IS_HINT_DEFAULT_100 (hintdesc))
-        klass->control_info[i].def = 100.0;
+	klass->control_info[i].def = 100.0;
       else if (LADSPA_IS_HINT_DEFAULT_440 (hintdesc))
-        klass->control_info[i].def = 440.0;
+	klass->control_info[i].def = 440.0;
     }
 #endif /* LADSPA_IS_HINT_HAS_DEFAULT */
 
-    klass->control_info[i].def = CLAMP(klass->control_info[i].def,
-                                       klass->control_info[i].lowerbound,
-                                       klass->control_info[i].upperbound);
-    
-    if (LADSPA_IS_PORT_INPUT(desc->PortDescriptors[current_portnum])) {
+    klass->control_info[i].def = CLAMP (klass->control_info[i].def,
+	klass->control_info[i].lowerbound, klass->control_info[i].upperbound);
+
+    if (LADSPA_IS_PORT_INPUT (desc->PortDescriptors[current_portnum])) {
       argperms = G_PARAM_READWRITE;
       klass->control_info[i].writable = TRUE;
     } else {
@@ -294,8 +314,8 @@ gst_ladspa_class_init (GstLADSPAClass *klass)
       klass->control_info[i].writable = FALSE;
     }
 
-    klass->control_info[i].name = g_strdup(desc->PortNames[current_portnum]);
-    argname = g_strdup(klass->control_info[i].name);
+    klass->control_info[i].name = g_strdup (desc->PortNames[current_portnum]);
+    argname = g_strdup (klass->control_info[i].name);
     /* find out if there is a (unitname) at the end of the argname and get rid
        of it */
     paren = g_strrstr (argname, " (");
@@ -305,123 +325,120 @@ gst_ladspa_class_init (GstLADSPAClass *klass)
     /* this is the same thing that param_spec_* will do */
     g_strcanon (argname, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-", '-');
     /* satisfy glib2 (argname[0] must be [A-Za-z]) */
-    if (!((argname[0] >= 'a' && argname[0] <= 'z') || (argname[0] >= 'A' && argname[0] <= 'Z'))) {
+    if (!((argname[0] >= 'a' && argname[0] <= 'z') || (argname[0] >= 'A'
+		&& argname[0] <= 'Z'))) {
       tempstr = argname;
-      argname = g_strconcat("param-", argname, NULL);
+      argname = g_strconcat ("param-", argname, NULL);
       g_free (tempstr);
     }
-    
+
     /* check for duplicate property names */
-    if (g_object_class_find_property(G_OBJECT_CLASS(klass), argname) != NULL){
-      gint numarg=1;
-      gchar *numargname = g_strdup_printf("%s_%d",argname,numarg++);
-      while (g_object_class_find_property(G_OBJECT_CLASS(klass), numargname) != NULL){
-        g_free(numargname);
-        numargname = g_strdup_printf("%s_%d",argname,numarg++);
+    if (g_object_class_find_property (G_OBJECT_CLASS (klass), argname) != NULL) {
+      gint numarg = 1;
+      gchar *numargname = g_strdup_printf ("%s_%d", argname, numarg++);
+
+      while (g_object_class_find_property (G_OBJECT_CLASS (klass),
+	      numargname) != NULL) {
+	g_free (numargname);
+	numargname = g_strdup_printf ("%s_%d", argname, numarg++);
       }
       argname = numargname;
     }
-    
+
     klass->control_info[i].param_name = argname;
-    
+
     DEBUG ("adding arg %s from %s", argname, klass->control_info[i].name);
-    
-    if (argtype==G_TYPE_BOOLEAN){
-      paramspec = g_param_spec_boolean(argname,argname,argname, FALSE, argperms);
-    } else if (argtype==G_TYPE_INT){      
-      paramspec = g_param_spec_int(argname,argname,argname, 
-        (gint)klass->control_info[i].lowerbound, 
-        (gint)klass->control_info[i].upperbound, 
-        (gint)klass->control_info[i].def, argperms);
-    } else if (klass->control_info[i].samplerate){
-      paramspec = g_param_spec_float(argname,argname,argname, 
-        0.0, G_MAXFLOAT, 
-        0.0, argperms);
+
+    if (argtype == G_TYPE_BOOLEAN) {
+      paramspec =
+	  g_param_spec_boolean (argname, argname, argname, FALSE, argperms);
+    } else if (argtype == G_TYPE_INT) {
+      paramspec = g_param_spec_int (argname, argname, argname,
+	  (gint) klass->control_info[i].lowerbound,
+	  (gint) klass->control_info[i].upperbound,
+	  (gint) klass->control_info[i].def, argperms);
+    } else if (klass->control_info[i].samplerate) {
+      paramspec = g_param_spec_float (argname, argname, argname,
+	  0.0, G_MAXFLOAT, 0.0, argperms);
     } else {
-      paramspec = g_param_spec_float(argname,argname,argname, 
-        klass->control_info[i].lowerbound, klass->control_info[i].upperbound, 
-        klass->control_info[i].def, argperms);
+      paramspec = g_param_spec_float (argname, argname, argname,
+	  klass->control_info[i].lowerbound, klass->control_info[i].upperbound,
+	  klass->control_info[i].def, argperms);
     }
-    
+
     /* properties have an offset of 1 */
-    g_object_class_install_property(G_OBJECT_CLASS(klass), i+1, paramspec);
+    g_object_class_install_property (G_OBJECT_CLASS (klass), i + 1, paramspec);
   }
 }
 
 static void
-gst_ladspa_init (GstLADSPA *ladspa)
+gst_ladspa_init (GstLADSPA * ladspa)
 {
   GstLADSPAClass *oclass;
   ladspa_control_info cinfo;
   GList *l;
   LADSPA_Descriptor *desc;
-  gint i,sinkcount,srccount;
+  gint i, sinkcount, srccount;
 
-  oclass = (GstLADSPAClass*)G_OBJECT_GET_CLASS (ladspa);
+  oclass = (GstLADSPAClass *) G_OBJECT_GET_CLASS (ladspa);
   desc = oclass->descriptor;
   ladspa->descriptor = oclass->descriptor;
-  
+
   /* allocate the various arrays */
-  ladspa->srcpads = g_new0(GstPad*,oclass->numsrcpads);
-  ladspa->sinkpads = g_new0(GstPad*,oclass->numsinkpads);
-  ladspa->controls = g_new(gfloat,oclass->numcontrols);
-  ladspa->dpman = gst_dpman_new ("ladspa_dpman", GST_ELEMENT(ladspa));
-  
+  ladspa->srcpads = g_new0 (GstPad *, oclass->numsrcpads);
+  ladspa->sinkpads = g_new0 (GstPad *, oclass->numsinkpads);
+  ladspa->controls = g_new (gfloat, oclass->numcontrols);
+  ladspa->dpman = gst_dpman_new ("ladspa_dpman", GST_ELEMENT (ladspa));
+
   /* set up pads */
   sinkcount = 0;
   srccount = 0;
-  for (l=GST_ELEMENT_CLASS (oclass)->padtemplates; l; l=l->next) {
+  for (l = GST_ELEMENT_CLASS (oclass)->padtemplates; l; l = l->next) {
     GstPad *pad = gst_pad_new_from_template (GST_PAD_TEMPLATE (l->data),
-                                             GST_PAD_TEMPLATE_NAME_TEMPLATE (l->data));
+	GST_PAD_TEMPLATE_NAME_TEMPLATE (l->data));
+
     gst_pad_set_link_function (pad, gst_ladspa_link);
-    gst_element_add_pad ((GstElement*)ladspa, pad);
+    gst_element_add_pad ((GstElement *) ladspa, pad);
 
     if (GST_PAD_DIRECTION (pad) == GST_PAD_SINK)
       ladspa->sinkpads[sinkcount++] = pad;
     else
       ladspa->srcpads[srccount++] = pad;
   }
-  
+
   /* set up dparams */
-  for (i=0; i<oclass->numcontrols; i++) {
-    if (LADSPA_IS_PORT_INPUT(desc->PortDescriptors[i])) {
+  for (i = 0; i < oclass->numcontrols; i++) {
+    if (LADSPA_IS_PORT_INPUT (desc->PortDescriptors[i])) {
       cinfo = oclass->control_info[i];
-      ladspa->controls[i]=cinfo.def;
-      
-      if (cinfo.toggled){
-        gst_dpman_add_required_dparam_callback (
-          ladspa->dpman, 
-          g_param_spec_int(cinfo.param_name, cinfo.name, cinfo.name,
-                           0, 1, (gint)(ladspa->controls[i]), G_PARAM_READWRITE),
-          "int", gst_ladspa_update_int, &(ladspa->controls[i])
-        );
-      }
-      else if (cinfo.integer){
-        gst_dpman_add_required_dparam_callback (
-          ladspa->dpman, 
-          g_param_spec_int(cinfo.param_name, cinfo.name, cinfo.name,
-                           (gint)cinfo.lowerbound, (gint)cinfo.upperbound,
-                           (gint)ladspa->controls[i], G_PARAM_READWRITE),
-          "int", gst_ladspa_update_int, &(ladspa->controls[i])
-        );
-      }
-      else if (cinfo.samplerate){
-        gst_dpman_add_required_dparam_direct (
-          ladspa->dpman, 
-          g_param_spec_float(cinfo.param_name, cinfo.name, cinfo.name,
-                           cinfo.lowerbound, cinfo.upperbound,
-                           ladspa->controls[i], G_PARAM_READWRITE),
-          "hertz-rate-bound", &(ladspa->controls[i])
-        );
-      }
-      else {
-        gst_dpman_add_required_dparam_direct (
-          ladspa->dpman, 
-          g_param_spec_float(cinfo.param_name, cinfo.name, cinfo.name,
-                           cinfo.lowerbound, cinfo.upperbound,
-                           ladspa->controls[i], G_PARAM_READWRITE),
-          "float", &(ladspa->controls[i])
-        );
+      ladspa->controls[i] = cinfo.def;
+
+      if (cinfo.toggled) {
+	gst_dpman_add_required_dparam_callback (ladspa->dpman,
+	    g_param_spec_int (cinfo.param_name, cinfo.name, cinfo.name,
+		0, 1, (gint) (ladspa->controls[i]), G_PARAM_READWRITE),
+	    "int", gst_ladspa_update_int, &(ladspa->controls[i])
+	    );
+      } else if (cinfo.integer) {
+	gst_dpman_add_required_dparam_callback (ladspa->dpman,
+	    g_param_spec_int (cinfo.param_name, cinfo.name, cinfo.name,
+		(gint) cinfo.lowerbound, (gint) cinfo.upperbound,
+		(gint) ladspa->controls[i], G_PARAM_READWRITE),
+	    "int", gst_ladspa_update_int, &(ladspa->controls[i])
+	    );
+      } else if (cinfo.samplerate) {
+	gst_dpman_add_required_dparam_direct (ladspa->dpman,
+	    g_param_spec_float (cinfo.param_name, cinfo.name, cinfo.name,
+		cinfo.lowerbound, cinfo.upperbound,
+		ladspa->controls[i], G_PARAM_READWRITE),
+	    "hertz-rate-bound", &(ladspa->controls[i])
+	    );
+      } else {
+	gst_dpman_add_required_dparam_direct (ladspa->dpman,
+	    g_param_spec_float (cinfo.param_name, cinfo.name, cinfo.name,
+		cinfo.lowerbound, cinfo.upperbound,
+		ladspa->controls[i], G_PARAM_READWRITE),
+	    "float", &(ladspa->controls[i])
+	    );
       }
     }
   }
@@ -429,58 +446,62 @@ gst_ladspa_init (GstLADSPA *ladspa)
   /* nonzero default needed to instantiate() some plugins */
   ladspa->samplerate = 44100;
 
-  ladspa->buffer_frames = 0; /* should be set with caps */
+  ladspa->buffer_frames = 0;	/* should be set with caps */
   ladspa->activated = FALSE;
-  ladspa->inplace_broken = LADSPA_IS_INPLACE_BROKEN(ladspa->descriptor->Properties);
+  ladspa->inplace_broken =
+      LADSPA_IS_INPLACE_BROKEN (ladspa->descriptor->Properties);
 
-  if (sinkcount==0 && srccount == 1) {
+  if (sinkcount == 0 && srccount == 1) {
     /* get mode (no sink pads) */
     DEBUG_OBJ (ladspa, "mono get mode with 1 src pad");
 
     gst_pad_set_get_function (ladspa->srcpads[0], gst_ladspa_get);
-  } else if (sinkcount==1){
+  } else if (sinkcount == 1) {
     /* with one sink we can use the chain function */
     DEBUG_OBJ (ladspa, "chain mode");
 
     gst_pad_set_chain_function (ladspa->sinkpads[0], gst_ladspa_chain);
-  } else if (sinkcount > 1){
+  } else if (sinkcount > 1) {
     /* more than one sink pad needs loop mode */
-    DEBUG_OBJ (ladspa, "loop mode with %d sink pads and %d src pads", sinkcount, srccount);
+    DEBUG_OBJ (ladspa, "loop mode with %d sink pads and %d src pads", sinkcount,
+	srccount);
 
     gst_element_set_loop_function (GST_ELEMENT (ladspa), gst_ladspa_loop);
-  } else if (sinkcount==0 && srccount == 0) {
+  } else if (sinkcount == 0 && srccount == 0) {
     /* for example, a plugin with only control inputs and output -- just ignore
      * it for now */
   } else {
-    g_warning ("%d sink pads, %d src pads not yet supported", sinkcount, srccount);
+    g_warning ("%d sink pads, %d src pads not yet supported", sinkcount,
+	srccount);
   }
 
   gst_ladspa_instantiate (ladspa);
 }
 
 static void
-gst_ladspa_update_int(const GValue *value, gpointer data)
+gst_ladspa_update_int (const GValue * value, gpointer data)
 {
-  gfloat *target = (gfloat*) data;
-  *target = (gfloat)g_value_get_int(value);
+  gfloat *target = (gfloat *) data;
+
+  *target = (gfloat) g_value_get_int (value);
 }
 
 static GstPadLinkReturn
-gst_ladspa_link (GstPad *pad, const GstCaps *caps)
+gst_ladspa_link (GstPad * pad, const GstCaps * caps)
 {
-  GstElement *element = (GstElement*)GST_PAD_PARENT (pad);
-  GstLADSPA *ladspa = (GstLADSPA*)element;
+  GstElement *element = (GstElement *) GST_PAD_PARENT (pad);
+  GstLADSPA *ladspa = (GstLADSPA *) element;
   const GList *l = NULL;
   gint rate;
   GstStructure *structure;
 
   /* if this fails in some other plugin, the graph is left in an inconsistent
      state */
-  for (l=gst_element_get_pad_list (element); l; l=l->next)
-    if (pad != (GstPad*)l->data)
-      if (gst_pad_try_set_caps ((GstPad*)l->data, caps) <= 0)
-        return GST_PAD_LINK_REFUSED;
-  
+  for (l = gst_element_get_pad_list (element); l; l = l->next)
+    if (pad != (GstPad *) l->data)
+      if (gst_pad_try_set_caps ((GstPad *) l->data, caps) <= 0)
+	return GST_PAD_LINK_REFUSED;
+
   /* we assume that the ladspa plugin can handle any sample rate, so this
      check gets put last */
   structure = gst_caps_get_structure (caps, 0);
@@ -488,48 +509,46 @@ gst_ladspa_link (GstPad *pad, const GstCaps *caps)
   /* have to instantiate ladspa plugin when samplerate changes (groan) */
   if (ladspa->samplerate != rate) {
     ladspa->samplerate = rate;
-    if (! gst_ladspa_instantiate(ladspa))
+    if (!gst_ladspa_instantiate (ladspa))
       return GST_PAD_LINK_REFUSED;
   }
-  
-  gst_structure_get_int  (structure, "buffer-frames", &ladspa->buffer_frames);
-  
+
+  gst_structure_get_int (structure, "buffer-frames", &ladspa->buffer_frames);
+
   return GST_PAD_LINK_OK;
 }
 
 #if 0
 static void
-gst_ladspa_force_src_caps(GstLADSPA *ladspa, GstPad *pad)
+gst_ladspa_force_src_caps (GstLADSPA * ladspa, GstPad * pad)
 {
   if (!ladspa->buffer_frames) {
-    ladspa->buffer_frames = 256; /* 5 ms at 44100 kHz (just a default...) */
+    ladspa->buffer_frames = 256;	/* 5 ms at 44100 kHz (just a default...) */
   }
 
   DEBUG_OBJ (ladspa, "forcing caps with rate=%d, buffer-frames=%d",
-             ladspa->samplerate, ladspa->buffer_frames);
+      ladspa->samplerate, ladspa->buffer_frames);
 
   gst_pad_try_set_caps (pad,
-    gst_caps_new (
-    "ladspa_src_caps",
-    "audio/x-raw-float",
-    gst_props_new (
-      "width",          G_TYPE_INT (32),
-      "endianness",     G_TYPE_INT (G_BYTE_ORDER),
-      "rate",           G_TYPE_INT (ladspa->samplerate),
-      "buffer-frames",	G_TYPE_INT (ladspa->buffer_frames),
-      "channels",	G_TYPE_INT (1),
-      NULL)));
+      gst_caps_new ("ladspa_src_caps",
+	  "audio/x-raw-float",
+	  gst_props_new ("width", G_TYPE_INT (32),
+	      "endianness", G_TYPE_INT (G_BYTE_ORDER),
+	      "rate", G_TYPE_INT (ladspa->samplerate),
+	      "buffer-frames", G_TYPE_INT (ladspa->buffer_frames),
+	      "channels", G_TYPE_INT (1), NULL)));
 }
 #endif
 
 static void
-gst_ladspa_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+gst_ladspa_set_property (GObject * object, guint prop_id, const GValue * value,
+    GParamSpec * pspec)
 {
-  GstLADSPA *ladspa = (GstLADSPA*)object;
+  GstLADSPA *ladspa = (GstLADSPA *) object;
   GstLADSPAClass *oclass;
   ladspa_control_info *control_info;
 
-  oclass = (GstLADSPAClass*)(G_OBJECT_GET_CLASS (object));
+  oclass = (GstLADSPAClass *) (G_OBJECT_GET_CLASS (object));
 
   /* remember, properties have an offset of 1 */
   prop_id--;
@@ -551,14 +570,16 @@ gst_ladspa_set_property (GObject *object, guint prop_id, const GValue *value, GP
   else
     ladspa->controls[prop_id] = g_value_get_float (value);
 
-  DEBUG_OBJ (object, "set arg %s to %f", control_info->name, ladspa->controls[prop_id]);
+  DEBUG_OBJ (object, "set arg %s to %f", control_info->name,
+      ladspa->controls[prop_id]);
 }
 
 static void
-gst_ladspa_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+gst_ladspa_get_property (GObject * object, guint prop_id, GValue * value,
+    GParamSpec * pspec)
 {
-  GstLADSPA *ladspa = (GstLADSPA*)object;
-  GstLADSPAClass *oclass = (GstLADSPAClass*)(G_OBJECT_GET_CLASS (object));
+  GstLADSPA *ladspa = (GstLADSPA *) object;
+  GstLADSPAClass *oclass = (GstLADSPAClass *) (G_OBJECT_GET_CLASS (object));
   ladspa_control_info *control_info;
 
   /* remember, properties have an offset of 1 */
@@ -574,62 +595,63 @@ gst_ladspa_get_property (GObject *object, guint prop_id, GValue *value, GParamSp
   if (control_info->toggled)
     g_value_set_boolean (value, ladspa->controls[prop_id] == 1.0);
   else if (control_info->integer)
-    g_value_set_int (value, (gint)ladspa->controls[prop_id]);
+    g_value_set_int (value, (gint) ladspa->controls[prop_id]);
   else
     g_value_set_float (value, ladspa->controls[prop_id]);
 
-  DEBUG_OBJ (object, "got arg %s as %f", control_info->name, ladspa->controls[prop_id]);
+  DEBUG_OBJ (object, "got arg %s as %f", control_info->name,
+      ladspa->controls[prop_id]);
 }
 
 static gboolean
-gst_ladspa_instantiate (GstLADSPA *ladspa)
+gst_ladspa_instantiate (GstLADSPA * ladspa)
 {
   LADSPA_Descriptor *desc;
   int i;
-  GstLADSPAClass *oclass = (GstLADSPAClass*)(G_OBJECT_GET_CLASS (ladspa));
+  GstLADSPAClass *oclass = (GstLADSPAClass *) (G_OBJECT_GET_CLASS (ladspa));
   gboolean was_activated;
-  
+
   desc = ladspa->descriptor;
-  
+
   /* check for old handle */
   was_activated = ladspa->activated;
-  if (ladspa->handle != NULL){
-    gst_ladspa_deactivate(ladspa);
-    desc->cleanup(ladspa->handle);
+  if (ladspa->handle != NULL) {
+    gst_ladspa_deactivate (ladspa);
+    desc->cleanup (ladspa->handle);
   }
-        
-  /* instantiate the plugin */ 
+
+  /* instantiate the plugin */
   DEBUG_OBJ (ladspa, "instantiating the plugin at %d Hz", ladspa->samplerate);
-  
-  ladspa->handle = desc->instantiate(desc,ladspa->samplerate);
+
+  ladspa->handle = desc->instantiate (desc, ladspa->samplerate);
   g_return_val_if_fail (ladspa->handle != NULL, FALSE);
 
   /* connect the control ports */
-  for (i=0;i<oclass->numcontrols;i++)
-    desc->connect_port(ladspa->handle,
-                       oclass->control_portnums[i],
-                       &(ladspa->controls[i]));
+  for (i = 0; i < oclass->numcontrols; i++)
+    desc->connect_port (ladspa->handle,
+	oclass->control_portnums[i], &(ladspa->controls[i]));
 
   /* reactivate if it was activated before the reinstantiation */
   if (was_activated)
-    gst_ladspa_activate(ladspa);
+    gst_ladspa_activate (ladspa);
 
   return TRUE;
 }
 
 static GstElementStateReturn
-gst_ladspa_change_state (GstElement *element)
+gst_ladspa_change_state (GstElement * element)
 {
   LADSPA_Descriptor *desc;
-  GstLADSPA *ladspa = (GstLADSPA*)element;
+  GstLADSPA *ladspa = (GstLADSPA *) element;
+
   desc = ladspa->descriptor;
 
   switch (GST_STATE_TRANSITION (element)) {
     case GST_STATE_NULL_TO_READY:
-      gst_ladspa_activate(ladspa);
+      gst_ladspa_activate (ladspa);
       break;
     case GST_STATE_READY_TO_NULL:
-      gst_ladspa_deactivate(ladspa);
+      gst_ladspa_deactivate (ladspa);
       break;
     default:
       break;
@@ -642,104 +664,109 @@ gst_ladspa_change_state (GstElement *element)
 }
 
 static void
-gst_ladspa_activate (GstLADSPA *ladspa)
+gst_ladspa_activate (GstLADSPA * ladspa)
 {
   LADSPA_Descriptor *desc;
+
   desc = ladspa->descriptor;
-  
+
   if (ladspa->activated)
-    gst_ladspa_deactivate(ladspa);
-  
+    gst_ladspa_deactivate (ladspa);
+
   DEBUG_OBJ (ladspa, "activating");
 
   /* activate the plugin (function might be null) */
   if (desc->activate != NULL)
-    desc->activate(ladspa->handle);
+    desc->activate (ladspa->handle);
 
   ladspa->activated = TRUE;
 }
 
 static void
-gst_ladspa_deactivate (GstLADSPA *ladspa)
+gst_ladspa_deactivate (GstLADSPA * ladspa)
 {
   LADSPA_Descriptor *desc;
+
   desc = ladspa->descriptor;
 
   DEBUG_OBJ (ladspa, "deactivating");
 
   /* deactivate the plugin (function might be null) */
   if (ladspa->activated && (desc->deactivate != NULL))
-    desc->deactivate(ladspa->handle);
+    desc->deactivate (ladspa->handle);
 
   ladspa->activated = FALSE;
 }
 
 static void
-gst_ladspa_loop (GstElement *element)
+gst_ladspa_loop (GstElement * element)
 {
-  guint        i, j, numsrcpads, numsinkpads;
-  guint        num_processed, num_to_process;
-  gint         largest_buffer;
-  LADSPA_Data  **data_in, **data_out;
-  GstBuffer    **buffers_in, **buffers_out;
- 
-  GstLADSPA       *ladspa = (GstLADSPA *)element;
-  GstLADSPAClass  *oclass = (GstLADSPAClass*)(G_OBJECT_GET_CLASS (ladspa));
+  guint i, j, numsrcpads, numsinkpads;
+  guint num_processed, num_to_process;
+  gint largest_buffer;
+  LADSPA_Data **data_in, **data_out;
+  GstBuffer **buffers_in, **buffers_out;
+
+  GstLADSPA *ladspa = (GstLADSPA *) element;
+  GstLADSPAClass *oclass = (GstLADSPAClass *) (G_OBJECT_GET_CLASS (ladspa));
   LADSPA_Descriptor *desc = ladspa->descriptor;
 
   numsinkpads = oclass->numsinkpads;
   numsrcpads = oclass->numsrcpads;
-  
+
   /* fixme: these mallocs need to die */
-  data_in = g_new0(LADSPA_Data*, numsinkpads);
-  data_out = g_new0(LADSPA_Data*, numsrcpads);
-  buffers_in = g_new0(GstBuffer*, numsinkpads);
-  buffers_out = g_new0(GstBuffer*, numsrcpads);
-  
+  data_in = g_new0 (LADSPA_Data *, numsinkpads);
+  data_out = g_new0 (LADSPA_Data *, numsrcpads);
+  buffers_in = g_new0 (GstBuffer *, numsinkpads);
+  buffers_out = g_new0 (GstBuffer *, numsrcpads);
+
   largest_buffer = -1;
 
   /* first get all the necessary data from the input ports */
-  for (i=0 ; i<numsinkpads ; i++){  
+  for (i = 0; i < numsinkpads; i++) {
   get_buffer:
     buffers_in[i] = GST_BUFFER (gst_pad_pull (ladspa->sinkpads[i]));
-    
+
     if (GST_IS_EVENT (buffers_in[i])) {
       /* push it out on all pads */
-      gst_data_ref_by_count ((GstData*)buffers_in[i], numsrcpads);
-      for (j=0; j<numsrcpads; j++)
-        gst_pad_push (ladspa->srcpads[j], GST_DATA (buffers_in[i]));
+      gst_data_ref_by_count ((GstData *) buffers_in[i], numsrcpads);
+      for (j = 0; j < numsrcpads; j++)
+	gst_pad_push (ladspa->srcpads[j], GST_DATA (buffers_in[i]));
       if (GST_EVENT_TYPE (buffers_in[i]) == GST_EVENT_EOS) {
-        /* shut down */
-        gst_element_set_eos (element);
-        return;
+	/* shut down */
+	gst_element_set_eos (element);
+	return;
       } else {
-        goto get_buffer;
+	goto get_buffer;
       }
     }
 
     if (largest_buffer < 0)
-      largest_buffer = GST_BUFFER_SIZE (buffers_in[i])/sizeof(gfloat);
+      largest_buffer = GST_BUFFER_SIZE (buffers_in[i]) / sizeof (gfloat);
     else
-      largest_buffer = MIN (GST_BUFFER_SIZE (buffers_in[i])/sizeof(gfloat), largest_buffer);
-    data_in[i] = (LADSPA_Data *) GST_BUFFER_DATA(buffers_in[i]);
-    GST_BUFFER_TIMESTAMP(buffers_in[i]) = ladspa->timestamp;
+      largest_buffer =
+	  MIN (GST_BUFFER_SIZE (buffers_in[i]) / sizeof (gfloat),
+	  largest_buffer);
+    data_in[i] = (LADSPA_Data *) GST_BUFFER_DATA (buffers_in[i]);
+    GST_BUFFER_TIMESTAMP (buffers_in[i]) = ladspa->timestamp;
   }
 
-  i=0;
+  i = 0;
   if (!ladspa->inplace_broken) {
-    for (; i<numsrcpads && i<numsinkpads; i++) {
+    for (; i < numsrcpads && i < numsinkpads; i++) {
       /* reuse input buffers */
       buffers_out[i] = buffers_in[i];
       data_out[i] = data_in[i];
     }
   }
-  for (; i<numsrcpads; i++) {
-    buffers_out[i] = gst_buffer_new_and_alloc (ladspa->buffer_frames * sizeof(gfloat));
+  for (; i < numsrcpads; i++) {
+    buffers_out[i] =
+	gst_buffer_new_and_alloc (ladspa->buffer_frames * sizeof (gfloat));
     GST_BUFFER_TIMESTAMP (buffers_out[i]) = ladspa->timestamp;
-    data_out[i] = (LADSPA_Data*)GST_BUFFER_DATA (buffers_out[i]);
+    data_out[i] = (LADSPA_Data *) GST_BUFFER_DATA (buffers_out[i]);
   }
-  
-  GST_DPMAN_PREPROCESS(ladspa->dpman, largest_buffer, ladspa->timestamp);
+
+  GST_DPMAN_PREPROCESS (ladspa->dpman, largest_buffer, ladspa->timestamp);
   num_processed = 0;
 
   /* split up processing of the buffer into chunks so that dparams can
@@ -747,37 +774,39 @@ gst_ladspa_loop (GstElement *element)
    * In many cases the buffer will be processed in one chunk anyway.
    */
   while (GST_DPMAN_PROCESS (ladspa->dpman, num_processed)) {
-    num_to_process = GST_DPMAN_FRAMES_TO_PROCESS(ladspa->dpman);
+    num_to_process = GST_DPMAN_FRAMES_TO_PROCESS (ladspa->dpman);
 
-    for (i=0 ; i<numsinkpads ; i++)
-      desc->connect_port (ladspa->handle, oclass->sinkpad_portnums[i], data_in[i]);
-    for (i=0 ; i<numsrcpads ; i++)
-      desc->connect_port (ladspa->handle, oclass->srcpad_portnums[i], data_out[i]);
+    for (i = 0; i < numsinkpads; i++)
+      desc->connect_port (ladspa->handle, oclass->sinkpad_portnums[i],
+	  data_in[i]);
+    for (i = 0; i < numsrcpads; i++)
+      desc->connect_port (ladspa->handle, oclass->srcpad_portnums[i],
+	  data_out[i]);
 
-    desc->run(ladspa->handle, num_to_process);
+    desc->run (ladspa->handle, num_to_process);
 
-    for (i=0 ; i<numsinkpads ; i++)
+    for (i = 0; i < numsinkpads; i++)
       data_in[i] += num_to_process;
-    for (i=0 ; i<numsrcpads ; i++)
+    for (i = 0; i < numsrcpads; i++)
       data_out[i] += num_to_process;
-    
+
     num_processed += num_to_process;
   }
-    
-  for (i=0 ; i<numsinkpads ; i++) {
+
+  for (i = 0; i < numsinkpads; i++) {
     if (i >= numsrcpads || buffers_out[i] != buffers_in[i])
-      gst_buffer_unref(buffers_in[i]);
+      gst_buffer_unref (buffers_in[i]);
     data_in[i] = NULL;
     buffers_in[i] = NULL;
-  }      
-  for (i=0 ; i<numsrcpads ; i++) {
+  }
+  for (i = 0; i < numsrcpads; i++) {
     DEBUG_OBJ (ladspa, "pushing buffer (%p) on src pad %d", buffers_out[i], i);
     gst_pad_push (ladspa->srcpads[i], GST_DATA (buffers_out[i]));
-    
+
     data_out[i] = NULL;
     buffers_out[i] = NULL;
   }
-  
+
   ladspa->timestamp += ladspa->buffer_frames * GST_SECOND / ladspa->samplerate;
 
   /* FIXME: move these mallocs and frees to the state-change handler */
@@ -789,7 +818,7 @@ gst_ladspa_loop (GstElement *element)
 }
 
 static void
-gst_ladspa_chain (GstPad *pad, GstData *_data)
+gst_ladspa_chain (GstPad * pad, GstData * _data)
 {
   GstBuffer *buffer_in = GST_BUFFER (_data);
   LADSPA_Descriptor *desc;
@@ -800,23 +829,23 @@ gst_ladspa_chain (GstPad *pad, GstData *_data)
   GstLADSPA *ladspa;
   GstLADSPAClass *oclass;
 
-  ladspa = (GstLADSPA*)GST_OBJECT_PARENT (pad);
+  ladspa = (GstLADSPA *) GST_OBJECT_PARENT (pad);
   oclass = (GstLADSPAClass *) (G_OBJECT_GET_CLASS (ladspa));
-  data_in = (LADSPA_Data *) GST_BUFFER_DATA(buffer_in);
-  num_samples = GST_BUFFER_SIZE(buffer_in) / sizeof(gfloat);
+  data_in = (LADSPA_Data *) GST_BUFFER_DATA (buffer_in);
+  num_samples = GST_BUFFER_SIZE (buffer_in) / sizeof (gfloat);
   numsrcpads = oclass->numsrcpads;
   desc = ladspa->descriptor;
 
   /* we shouldn't get events here... */
   g_return_if_fail (GST_IS_BUFFER (buffer_in));
-  
+
   /* FIXME: this function shouldn't need to malloc() anything */
   if (numsrcpads > 0) {
-    buffers_out = g_new(GstBuffer*, numsrcpads);
-    data_out = g_new(LADSPA_Data*, numsrcpads);
+    buffers_out = g_new (GstBuffer *, numsrcpads);
+    data_out = g_new (LADSPA_Data *, numsrcpads);
   }
 
-  i=0;
+  i = 0;
   if (!ladspa->inplace_broken && numsrcpads) {
     /* reuse the first (chained) buffer */
     buffers_out[i] = buffer_in;
@@ -824,54 +853,56 @@ gst_ladspa_chain (GstPad *pad, GstData *_data)
     data_out[i] = data_in;
     i++;
   }
-  for (; i<numsrcpads; i++) {
-    buffers_out[i] = gst_buffer_new_and_alloc (GST_BUFFER_SIZE(buffer_in));
+  for (; i < numsrcpads; i++) {
+    buffers_out[i] = gst_buffer_new_and_alloc (GST_BUFFER_SIZE (buffer_in));
     DEBUG ("new %d", GST_BUFFER_SIZE (buffer_in));
     GST_BUFFER_TIMESTAMP (buffers_out[i]) = ladspa->timestamp;
-    data_out[i] = (LADSPA_Data*)GST_BUFFER_DATA (buffers_out[i]);
+    data_out[i] = (LADSPA_Data *) GST_BUFFER_DATA (buffers_out[i]);
   }
 
-  GST_DPMAN_PREPROCESS(ladspa->dpman, num_samples, GST_BUFFER_TIMESTAMP(buffer_in));
+  GST_DPMAN_PREPROCESS (ladspa->dpman, num_samples,
+      GST_BUFFER_TIMESTAMP (buffer_in));
   num_processed = 0;
 
   /* split up processing of the buffer into chunks so that dparams can
    * be updated when required.
    * In many cases the buffer will be processed in one chunk anyway.
    */
-  while(GST_DPMAN_PROCESS(ladspa->dpman, num_processed)) {
-    num_to_process = GST_DPMAN_FRAMES_TO_PROCESS(ladspa->dpman);
+  while (GST_DPMAN_PROCESS (ladspa->dpman, num_processed)) {
+    num_to_process = GST_DPMAN_FRAMES_TO_PROCESS (ladspa->dpman);
+
+    desc->connect_port (ladspa->handle, oclass->sinkpad_portnums[0], data_in);
+    for (i = 0; i < numsrcpads; i++)
+      desc->connect_port (ladspa->handle, oclass->srcpad_portnums[i],
+	  data_out[i]);
 
-    desc->connect_port(ladspa->handle,oclass->sinkpad_portnums[0],data_in);  
-    for (i=0 ; i<numsrcpads ; i++)
-      desc->connect_port(ladspa->handle,oclass->srcpad_portnums[i],data_out[i]);
+    desc->run (ladspa->handle, num_to_process);
 
-    desc->run(ladspa->handle, num_to_process);
-    
     data_in += num_to_process;
-    for (i=0 ; i<numsrcpads ; i++)
+    for (i = 0; i < numsrcpads; i++)
       data_out[i] += num_to_process;
 
     num_processed += num_to_process;
   }
 
   if (!numsrcpads || buffers_out[0] != buffer_in)
-    gst_buffer_unref(buffer_in);
+    gst_buffer_unref (buffer_in);
 
   if (numsrcpads) {
-    for (i=0; i<numsrcpads; i++) {
+    for (i = 0; i < numsrcpads; i++) {
       DEBUG_OBJ (ladspa, "pushing buffer (%p, length %u bytes) on src pad %d",
-                 buffers_out[i], GST_BUFFER_SIZE (buffers_out[i]), i);
+	  buffers_out[i], GST_BUFFER_SIZE (buffers_out[i]), i);
       gst_pad_push (ladspa->srcpads[i], GST_DATA (buffers_out[i]));
     }
 
-    g_free(buffers_out);
-    g_free(data_out);
+    g_free (buffers_out);
+    g_free (data_out);
   }
 }
 
 static GstData *
-gst_ladspa_get(GstPad *pad)
-{  
+gst_ladspa_get (GstPad * pad)
+{
   GstLADSPA *ladspa;
   GstLADSPAClass *oclass;
   GstBuffer *buf;
@@ -879,120 +910,111 @@ gst_ladspa_get(GstPad *pad)
   LADSPA_Descriptor *desc;
   guint num_to_process, num_processed;
 
-  ladspa = (GstLADSPA *)gst_pad_get_parent (pad);
-  oclass = (GstLADSPAClass*)(G_OBJECT_GET_CLASS(ladspa));
+  ladspa = (GstLADSPA *) gst_pad_get_parent (pad);
+  oclass = (GstLADSPAClass *) (G_OBJECT_GET_CLASS (ladspa));
   desc = ladspa->descriptor;
 
   /* 4096 is arbitrary */
   buf = gst_buffer_new_and_alloc (4096);
-  GST_BUFFER_TIMESTAMP(buf) = ladspa->timestamp;
-  data = (LADSPA_Data *) GST_BUFFER_DATA(buf);  
+  GST_BUFFER_TIMESTAMP (buf) = ladspa->timestamp;
+  data = (LADSPA_Data *) GST_BUFFER_DATA (buf);
 
-  GST_DPMAN_PREPROCESS(ladspa->dpman, ladspa->buffer_frames, ladspa->timestamp);
+  GST_DPMAN_PREPROCESS (ladspa->dpman, ladspa->buffer_frames,
+      ladspa->timestamp);
   num_processed = 0;
 
   /* split up processing of the buffer into chunks so that dparams can
    * be updated when required.
    * In many cases the buffer will be processed in one chunk anyway.
    */
-  while(GST_DPMAN_PROCESS(ladspa->dpman, num_processed)) {
-    num_to_process = GST_DPMAN_FRAMES_TO_PROCESS(ladspa->dpman);
+  while (GST_DPMAN_PROCESS (ladspa->dpman, num_processed)) {
+    num_to_process = GST_DPMAN_FRAMES_TO_PROCESS (ladspa->dpman);
 
-    /* update timestamp */  
+    /* update timestamp */
     ladspa->timestamp += num_to_process * GST_SECOND / ladspa->samplerate;
 
-    desc->connect_port(ladspa->handle,oclass->srcpad_portnums[0],data);  
+    desc->connect_port (ladspa->handle, oclass->srcpad_portnums[0], data);
+
+    desc->run (ladspa->handle, num_to_process);
 
-    desc->run(ladspa->handle, num_to_process);
-    
     data += num_to_process;
     num_processed = num_to_process;
   }
-  
+
   return GST_DATA (buf);
 }
 
 static void
-ladspa_describe_plugin(const char *pcFullFilename,
-                       void *pvPluginHandle,
-                       LADSPA_Descriptor_Function pfDescriptorFunction)
+ladspa_describe_plugin (const char *pcFullFilename,
+    void *pvPluginHandle, LADSPA_Descriptor_Function pfDescriptorFunction)
 {
   const LADSPA_Descriptor *desc;
   gint i;
   GTypeInfo typeinfo = {
-      sizeof(GstLADSPAClass),
-      (GBaseInitFunc)gst_ladspa_base_init,
-      NULL,
-      (GClassInitFunc)gst_ladspa_class_init,
-      NULL,
-      NULL,
-      sizeof(GstLADSPA),
-      0,
-      (GInstanceInitFunc)gst_ladspa_init,
+    sizeof (GstLADSPAClass),
+    (GBaseInitFunc) gst_ladspa_base_init,
+    NULL,
+    (GClassInitFunc) gst_ladspa_class_init,
+    NULL,
+    NULL,
+    sizeof (GstLADSPA),
+    0,
+    (GInstanceInitFunc) gst_ladspa_init,
   };
   GType type;
 
   /* walk through all the plugins in this pluginlibrary */
   i = 0;
-  while ((desc = pfDescriptorFunction(i++))) {
+  while ((desc = pfDescriptorFunction (i++))) {
     gchar *type_name;
 
     /* construct the type */
-    type_name = g_strdup_printf("ladspa-%s",desc->Label);
+    type_name = g_strdup_printf ("ladspa-%s", desc->Label);
     g_strcanon (type_name, G_CSET_A_2_Z G_CSET_a_2_z G_CSET_DIGITS "-+", '-');
     /* if it's already registered, drop it */
-    if (g_type_from_name(type_name)) {
-      g_free(type_name);
+    if (g_type_from_name (type_name)) {
+      g_free (type_name);
       continue;
     }
 
     /* base-init temp alloc */
-    g_hash_table_insert(ladspa_descriptors,
-                        GINT_TO_POINTER(0),
-                        (gpointer)desc);
+    g_hash_table_insert (ladspa_descriptors,
+	GINT_TO_POINTER (0), (gpointer) desc);
 
     /* create the type now */
-    type = g_type_register_static(GST_TYPE_ELEMENT, type_name, &typeinfo, 0);
+    type = g_type_register_static (GST_TYPE_ELEMENT, type_name, &typeinfo, 0);
     if (!gst_element_register (ladspa_plugin, type_name, GST_RANK_NONE, type))
       continue;
 
     /* add this plugin to the hash */
-    g_hash_table_insert(ladspa_descriptors,
-                        GINT_TO_POINTER(type),
-                        (gpointer)desc);
+    g_hash_table_insert (ladspa_descriptors,
+	GINT_TO_POINTER (type), (gpointer) desc);
   }
 
   g_hash_table_remove (ladspa_descriptors, GINT_TO_POINTER (0));
 }
 
 static gboolean
-plugin_init (GstPlugin *plugin)
+plugin_init (GstPlugin * plugin)
 {
   GST_DEBUG_CATEGORY_INIT (ladspa_debug, "ladspa",
-                           GST_DEBUG_FG_GREEN | GST_DEBUG_BG_BLACK | GST_DEBUG_BOLD,
-                           "LADSPA");
+      GST_DEBUG_FG_GREEN | GST_DEBUG_BG_BLACK | GST_DEBUG_BOLD, "LADSPA");
 
-  ladspa_descriptors = g_hash_table_new(NULL,NULL);
-  parent_class = g_type_class_ref(GST_TYPE_ELEMENT);
+  ladspa_descriptors = g_hash_table_new (NULL, NULL);
+  parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
 
   ladspa_plugin = plugin;
 
-  LADSPAPluginSearch(ladspa_describe_plugin);
+  LADSPAPluginSearch (ladspa_describe_plugin);
 
   /* initialize dparam support library */
-  gst_control_init(NULL,NULL);
-  
+  gst_control_init (NULL, NULL);
+
   return TRUE;
 }
 
-GST_PLUGIN_DEFINE (
-  GST_VERSION_MAJOR,
-  GST_VERSION_MINOR,
-  "ladspa",
-  "All LADSPA plugins",
-  plugin_init,
-  VERSION,
-  GST_LICENSE,
-  GST_PACKAGE,
-  GST_ORIGIN
-)
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    "ladspa",
+    "All LADSPA plugins",
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
diff --git a/ext/ladspa/gstladspa.h b/ext/ladspa/gstladspa.h
index f3556f74..b40cd145 100644
--- a/ext/ladspa/gstladspa.h
+++ b/ext/ladspa/gstladspa.h
@@ -31,62 +31,60 @@
 
 
 #ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+extern "C"
+{
+#endif				/* __cplusplus */
 
-typedef struct _ladspa_control_info {
-  gchar *name;
-  gchar *param_name;
-  gfloat lowerbound, upperbound;
-  gfloat def;
-  gboolean lower,upper,samplerate;
-  gboolean toggled, logarithmic, integer, writable;
-} ladspa_control_info;
+  typedef struct _ladspa_control_info
+  {
+    gchar *name;
+    gchar *param_name;
+    gfloat lowerbound, upperbound;
+    gfloat def;
+    gboolean lower, upper, samplerate;
+    gboolean toggled, logarithmic, integer, writable;
+  } ladspa_control_info;
 
-typedef struct _GstLADSPA GstLADSPA;
-typedef struct _GstLADSPAClass GstLADSPAClass;
+  typedef struct _GstLADSPA GstLADSPA;
+  typedef struct _GstLADSPAClass GstLADSPAClass;
 
-struct _GstLADSPA {
-  GstElement element;
+  struct _GstLADSPA
+  {
+    GstElement element;
 
-  LADSPA_Descriptor *descriptor;
-  LADSPA_Handle *handle;
+    LADSPA_Descriptor *descriptor;
+    LADSPA_Handle *handle;
 
-  GstDParamManager *dpman;
+    GstDParamManager *dpman;
 
-  gfloat *controls;
-  
-  GstPad **sinkpads, 
-         **srcpads;
+    gfloat *controls;
 
-  gboolean activated;
+    GstPad **sinkpads, **srcpads;
 
-  gint samplerate, buffer_frames;
-  gint64 timestamp;
-  gboolean inplace_broken;
-};
+    gboolean activated;
 
-struct _GstLADSPAClass {
-  GstElementClass parent_class;
+    gint samplerate, buffer_frames;
+    gint64 timestamp;
+    gboolean inplace_broken;
+  };
 
-  LADSPA_Descriptor *descriptor;
+  struct _GstLADSPAClass
+  {
+    GstElementClass parent_class;
 
-  gint numports,
-       numsinkpads, 
-       numsrcpads, 
-       numcontrols;
+    LADSPA_Descriptor *descriptor;
 
-  gint *sinkpad_portnums, 
-       *srcpad_portnums, 
-       *control_portnums;
+    gint numports, numsinkpads, numsrcpads, numcontrols;
 
-  ladspa_control_info *control_info;
-};
+    gint *sinkpad_portnums, *srcpad_portnums, *control_portnums;
+
+    ladspa_control_info *control_info;
+  };
 
 
 #ifdef __cplusplus
 }
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 
-#endif /* __GST_LADSPA_H__ */
+#endif				/* __GST_LADSPA_H__ */
diff --git a/ext/ladspa/load.c b/ext/ladspa/load.c
index bf52eb1f..98337f58 100644
--- a/ext/ladspa/load.c
+++ b/ext/ladspa/load.c
@@ -26,18 +26,19 @@
    not an absolute path (i.e. does not begin with / character), this
    routine will search the LADSPA_PATH for the file. */
 static void *
-dlopenLADSPA(const char * pcFilename, int iFlag) {
+dlopenLADSPA (const char *pcFilename, int iFlag)
+{
 
-  char * pcBuffer;
-  const char * pcEnd;
-  const char * pcLADSPAPath;
-  const char * pcStart;
+  char *pcBuffer;
+  const char *pcEnd;
+  const char *pcLADSPAPath;
+  const char *pcStart;
   int iEndsInSO;
   int iNeedSlash;
   size_t iFilenameLength;
-  void * pvResult;
+  void *pvResult;
 
-  iFilenameLength = strlen(pcFilename);
+  iFilenameLength = strlen (pcFilename);
   pvResult = NULL;
 
   if (pcFilename[0] == '/') {
@@ -45,12 +46,11 @@ dlopenLADSPA(const char * pcFilename, int iFlag) {
     /* The filename is absolute. Assume the user knows what he/she is
        doing and simply dlopen() it. */
 
-    pvResult = dlopen(pcFilename, iFlag);
+    pvResult = dlopen (pcFilename, iFlag);
     if (pvResult != NULL)
       return pvResult;
 
-  }
-  else {
+  } else {
 
     /* If the filename is not absolute then we wish to check along the
        LADSPA_PATH path to see if we can find the file there. We do
@@ -63,8 +63,8 @@ dlopenLADSPA(const char * pcFilename, int iFlag) {
      */
 
     pcLADSPAPath = g_strdup_printf ("%s:/usr/lib/ladspa:/usr/local/lib/ladspa",
-	getenv("LADSPA_PATH"));
-    
+	getenv ("LADSPA_PATH"));
+
     if (pcLADSPAPath) {
 
       pcStart = pcLADSPAPath;
@@ -72,24 +72,24 @@ dlopenLADSPA(const char * pcFilename, int iFlag) {
 	pcEnd = pcStart;
 	while (*pcEnd != ':' && *pcEnd != '\0')
 	  pcEnd++;
-	
-	pcBuffer = malloc(iFilenameLength + 2 + (pcEnd - pcStart));
+
+	pcBuffer = malloc (iFilenameLength + 2 + (pcEnd - pcStart));
 	if (pcEnd > pcStart)
-	  strncpy(pcBuffer, pcStart, pcEnd - pcStart);
+	  strncpy (pcBuffer, pcStart, pcEnd - pcStart);
 	iNeedSlash = 0;
 	if (pcEnd > pcStart)
 	  if (*(pcEnd - 1) != '/') {
 	    iNeedSlash = 1;
 	    pcBuffer[pcEnd - pcStart] = '/';
 	  }
-	strcpy(pcBuffer + iNeedSlash + (pcEnd - pcStart), pcFilename);
-	
-	pvResult = dlopen(pcBuffer, iFlag);
-	
+	strcpy (pcBuffer + iNeedSlash + (pcEnd - pcStart), pcFilename);
+
+	pvResult = dlopen (pcBuffer, iFlag);
+
 	free (pcBuffer);
 	if (pvResult != NULL)
 	  return pvResult;
-	
+
 	pcStart = pcEnd;
 	if (*pcStart == ':')
 	  pcStart++;
@@ -101,13 +101,13 @@ dlopenLADSPA(const char * pcFilename, int iFlag) {
      ".so". In this case, add this suffix and recurse. */
   iEndsInSO = 0;
   if (iFilenameLength > 3)
-    iEndsInSO = (strcmp(pcFilename + iFilenameLength - 3, ".so") == 0);
+    iEndsInSO = (strcmp (pcFilename + iFilenameLength - 3, ".so") == 0);
   if (!iEndsInSO) {
-    pcBuffer = malloc(iFilenameLength + 4);
-    strcpy(pcBuffer, pcFilename);
-    strcat(pcBuffer, ".so");
-    pvResult = dlopenLADSPA(pcBuffer, iFlag);
-    free(pcBuffer);
+    pcBuffer = malloc (iFilenameLength + 4);
+    strcpy (pcBuffer, pcFilename);
+    strcat (pcBuffer, ".so");
+    pvResult = dlopenLADSPA (pcBuffer, iFlag);
+    free (pcBuffer);
   }
 
   if (pvResult != NULL)
@@ -120,23 +120,22 @@ dlopenLADSPA(const char * pcFilename, int iFlag) {
      will be kept when multiple calls are made to dlopen(). We've
      covered the former case - now we can handle the latter by calling
      dlopen() again here. */
-  return dlopen(pcFilename, iFlag);
+  return dlopen (pcFilename, iFlag);
 }
 
 /*****************************************************************************/
 
 void *
-loadLADSPAPluginLibrary(const char * pcPluginFilename) {
+loadLADSPAPluginLibrary (const char *pcPluginFilename)
+{
 
-  void * pvPluginHandle;
+  void *pvPluginHandle;
 
-  pvPluginHandle = dlopenLADSPA(pcPluginFilename, RTLD_NOW);
+  pvPluginHandle = dlopenLADSPA (pcPluginFilename, RTLD_NOW);
   if (!pvPluginHandle) {
-    fprintf(stderr, 
-	    "Failed to load plugin \"%s\": %s\n", 
-	    pcPluginFilename,
-	    dlerror());
-    exit(1);
+    fprintf (stderr,
+	"Failed to load plugin \"%s\": %s\n", pcPluginFilename, dlerror ());
+    exit (1);
   }
 
   return pvPluginHandle;
@@ -144,49 +143,49 @@ loadLADSPAPluginLibrary(const char * pcPluginFilename) {
 
 /*****************************************************************************/
 
-void 
-unloadLADSPAPluginLibrary(void * pvLADSPAPluginLibrary) {
-  dlclose(pvLADSPAPluginLibrary);
+void
+unloadLADSPAPluginLibrary (void *pvLADSPAPluginLibrary)
+{
+  dlclose (pvLADSPAPluginLibrary);
 }
 
 /*****************************************************************************/
 
 const LADSPA_Descriptor *
-findLADSPAPluginDescriptor(void * pvLADSPAPluginLibrary,
-			   const char * pcPluginLibraryFilename,
-			   const char * pcPluginLabel) {
+findLADSPAPluginDescriptor (void *pvLADSPAPluginLibrary,
+    const char *pcPluginLibraryFilename, const char *pcPluginLabel)
+{
 
-  const LADSPA_Descriptor * psDescriptor;
+  const LADSPA_Descriptor *psDescriptor;
   LADSPA_Descriptor_Function pfDescriptorFunction;
   unsigned long lPluginIndex;
 
-  dlerror();
-  pfDescriptorFunction 
-    = (LADSPA_Descriptor_Function)dlsym(pvLADSPAPluginLibrary,
-					"ladspa_descriptor");
+  dlerror ();
+  pfDescriptorFunction
+      = (LADSPA_Descriptor_Function) dlsym (pvLADSPAPluginLibrary,
+      "ladspa_descriptor");
   if (!pfDescriptorFunction) {
-    const char * pcError = dlerror();
+    const char *pcError = dlerror ();
+
     if (pcError) {
-      fprintf(stderr,
-	      "Unable to find ladspa_descriptor() function in plugin "
-	      "library file \"%s\": %s.\n"
-	      "Are you sure this is a LADSPA plugin file?\n", 
-	      pcPluginLibraryFilename,
-	      pcError);
-      exit(1);
+      fprintf (stderr,
+	  "Unable to find ladspa_descriptor() function in plugin "
+	  "library file \"%s\": %s.\n"
+	  "Are you sure this is a LADSPA plugin file?\n",
+	  pcPluginLibraryFilename, pcError);
+      exit (1);
     }
   }
 
   for (lPluginIndex = 0;; lPluginIndex++) {
-    psDescriptor = pfDescriptorFunction(lPluginIndex);
+    psDescriptor = pfDescriptorFunction (lPluginIndex);
     if (psDescriptor == NULL) {
-      fprintf(stderr,
-	      "Unable to find label \"%s\" in plugin library file \"%s\".\n",
-	      pcPluginLabel,
-	      pcPluginLibraryFilename);
-      exit(1);      
+      fprintf (stderr,
+	  "Unable to find label \"%s\" in plugin library file \"%s\".\n",
+	  pcPluginLabel, pcPluginLibraryFilename);
+      exit (1);
     }
-    if (strcmp(psDescriptor->Label, pcPluginLabel) == 0)
+    if (strcmp (psDescriptor->Label, pcPluginLabel) == 0)
       return psDescriptor;
   }
 }
diff --git a/ext/ladspa/search.c b/ext/ladspa/search.c
index 08b28d12..0f690275 100644
--- a/ext/ladspa/search.c
+++ b/ext/ladspa/search.c
@@ -27,19 +27,20 @@
 
 /* Search just the one directory. */
 static void
-LADSPADirectoryPluginSearch
-(const char * pcDirectory, 
- LADSPAPluginSearchCallbackFunction fCallbackFunction) {
+    LADSPADirectoryPluginSearch
+    (const char *pcDirectory,
+    LADSPAPluginSearchCallbackFunction fCallbackFunction)
+{
 
-  char * pcFilename;
-  DIR * psDirectory;
+  char *pcFilename;
+  DIR *psDirectory;
   LADSPA_Descriptor_Function fDescriptorFunction;
   long lDirLength;
   long iNeedSlash;
-  struct dirent * psDirectoryEntry;
-  void * pvPluginHandle;
+  struct dirent *psDirectoryEntry;
+  void *pvPluginHandle;
 
-  lDirLength = strlen(pcDirectory);
+  lDirLength = strlen (pcDirectory);
   if (!lDirLength)
     return;
   if (pcDirectory[lDirLength - 1] == '/')
@@ -47,66 +48,63 @@ LADSPADirectoryPluginSearch
   else
     iNeedSlash = 1;
 
-  psDirectory = opendir(pcDirectory);
+  psDirectory = opendir (pcDirectory);
   if (!psDirectory)
     return;
 
   while (1) {
 
-    psDirectoryEntry = readdir(psDirectory);
+    psDirectoryEntry = readdir (psDirectory);
     if (!psDirectoryEntry) {
-      closedir(psDirectory);
+      closedir (psDirectory);
       return;
     }
 
-    pcFilename = malloc(lDirLength
-			+ strlen(psDirectoryEntry->d_name)
-			+ 1 + iNeedSlash);
-    strcpy(pcFilename, pcDirectory);
+    pcFilename = malloc (lDirLength + strlen (psDirectoryEntry->d_name)
+	+ 1 + iNeedSlash);
+    strcpy (pcFilename, pcDirectory);
     if (iNeedSlash)
-      strcat(pcFilename, "/");
-    strcat(pcFilename, psDirectoryEntry->d_name);
-    
-    pvPluginHandle = dlopen(pcFilename, RTLD_LAZY);
+      strcat (pcFilename, "/");
+    strcat (pcFilename, psDirectoryEntry->d_name);
+
+    pvPluginHandle = dlopen (pcFilename, RTLD_LAZY);
     if (pvPluginHandle) {
       /* This is a file and the file is a shared library! */
 
-      dlerror();
+      dlerror ();
       fDescriptorFunction
-	= (LADSPA_Descriptor_Function)dlsym(pvPluginHandle,
-					    "ladspa_descriptor");
-      if (dlerror() == NULL && fDescriptorFunction) {
+	  = (LADSPA_Descriptor_Function) dlsym (pvPluginHandle,
+	  "ladspa_descriptor");
+      if (dlerror () == NULL && fDescriptorFunction) {
 	/* We've successfully found a ladspa_descriptor function. Pass
-           it to the callback function. */
-	fCallbackFunction(pcFilename,
-			  pvPluginHandle,
-			  fDescriptorFunction);
-      }
-      else {
+	   it to the callback function. */
+	fCallbackFunction (pcFilename, pvPluginHandle, fDescriptorFunction);
+      } else {
 	/* It was a library, but not a LADSPA one. Unload it. */
-	dlclose(pcFilename);
+	dlclose (pcFilename);
       }
     }
-    free(pcFilename);
+    free (pcFilename);
   }
 }
 
 /*****************************************************************************/
 
-void 
-LADSPAPluginSearch(LADSPAPluginSearchCallbackFunction fCallbackFunction) {
+void
+LADSPAPluginSearch (LADSPAPluginSearchCallbackFunction fCallbackFunction)
+{
 
-  char * pcBuffer;
-  const char * pcEnd;
-  const char * pcLADSPAPath;
-  const char * pcStart;
+  char *pcBuffer;
+  const char *pcEnd;
+  const char *pcLADSPAPath;
+  const char *pcStart;
 
   /* thomasvs: I'm sorry, but I'm going to add glib stuff here.
-  * I'm appending logical values for LADSPA_PATH here
-  */
+   * I'm appending logical values for LADSPA_PATH here
+   */
 
   pcLADSPAPath = g_strdup_printf ("%s:/usr/lib/ladspa:/usr/local/lib/ladspa",
-	          getenv("LADSPA_PATH"));
+      getenv ("LADSPA_PATH"));
 
   if (!pcLADSPAPath) {
 /*    fprintf(stderr, */
@@ -114,20 +112,20 @@ LADSPAPluginSearch(LADSPAPluginSearchCallbackFunction fCallbackFunction) {
 /*	    "environment variable set.\n"); */
     return;
   }
-  
+
   pcStart = pcLADSPAPath;
   while (*pcStart != '\0') {
     pcEnd = pcStart;
     while (*pcEnd != ':' && *pcEnd != '\0')
       pcEnd++;
-    
-    pcBuffer = malloc(1 + pcEnd - pcStart);
+
+    pcBuffer = malloc (1 + pcEnd - pcStart);
     if (pcEnd > pcStart)
-      strncpy(pcBuffer, pcStart, pcEnd - pcStart);
+      strncpy (pcBuffer, pcStart, pcEnd - pcStart);
     pcBuffer[pcEnd - pcStart] = '\0';
-    
-    LADSPADirectoryPluginSearch(pcBuffer, fCallbackFunction);
-    free(pcBuffer);
+
+    LADSPADirectoryPluginSearch (pcBuffer, fCallbackFunction);
+    free (pcBuffer);
 
     pcStart = pcEnd;
     if (*pcStart == ':')
diff --git a/ext/ladspa/utils.h b/ext/ladspa/utils.h
index d470eb0d..7a22b50b 100644
--- a/ext/ladspa/utils.h
+++ b/ext/ladspa/utils.h
@@ -20,20 +20,19 @@
    unloadLADSPAPluginLibrary(). Errors are handled by writing a
    message to stderr and calling exit(1). It is alright (although
    inefficient) to call this more than once for the same file. */
-void * loadLADSPAPluginLibrary(const char * pcPluginFilename);
+void *loadLADSPAPluginLibrary (const char *pcPluginFilename);
 
 /* This function unloads a LADSPA plugin library. */
-void unloadLADSPAPluginLibrary(void * pvLADSPAPluginLibrary);
+void unloadLADSPAPluginLibrary (void *pvLADSPAPluginLibrary);
 
 /* This function locates a LADSPA plugin within a plugin library
    loaded with loadLADSPAPluginLibrary(). Errors are handled by
    writing a message to stderr and calling exit(1). Note that the
    plugin library filename is only included to help provide
    informative error messages. */
-const LADSPA_Descriptor *
-findLADSPAPluginDescriptor(void * pvLADSPAPluginLibrary,
-			   const char * pcPluginLibraryFilename,
-			   const char * pcPluginLabel);
+const LADSPA_Descriptor *findLADSPAPluginDescriptor (void
+    *pvLADSPAPluginLibrary, const char *pcPluginLibraryFilename,
+    const char *pcPluginLabel);
 
 /*****************************************************************************/
 
@@ -44,16 +43,15 @@ findLADSPAPluginDescriptor(void * pvLADSPAPluginLibrary,
    style) and a LADSPA_DescriptorFunction (from which
    LADSPA_Descriptors can be acquired). */
 typedef void LADSPAPluginSearchCallbackFunction
-(const char * pcFullFilename, 
- void * pvPluginHandle,
- LADSPA_Descriptor_Function fDescriptorFunction);
+    (const char *pcFullFilename,
+    void *pvPluginHandle, LADSPA_Descriptor_Function fDescriptorFunction);
 
 /* Search through the $(LADSPA_PATH) (or a default path) for any
    LADSPA plugin libraries. Each plugin library is tested using
    dlopen() and dlsym(,"ladspa_descriptor"). After loading each
    library, the callback function is called to process it. This
    function leaves items passed to the callback function open. */
-void LADSPAPluginSearch(LADSPAPluginSearchCallbackFunction fCallbackFunction);
+void LADSPAPluginSearch (LADSPAPluginSearchCallbackFunction fCallbackFunction);
 
 /*****************************************************************************/