gst-indent

Original commit message from CVS:
gst-indent

4 files changed, 458 insertions, 453 deletions

diff --git a/gst/spectrum/demo-osssrc.c b/gst/spectrum/demo-osssrc.c
index 3431ec91..462fcf90 100644
--- a/gst/spectrum/demo-osssrc.c
+++ b/gst/spectrum/demo-osssrc.c
@@ -3,12 +3,14 @@
 
 extern gboolean _gst_plugin_spew;
 
-void spectrum_chain(GstPad *pad,GstData *_data);
-gboolean idle_func(gpointer data);
+void spectrum_chain (GstPad * pad, GstData * _data);
+gboolean idle_func (gpointer data);
 
 GtkWidget *drawingarea;
 
-int main(int argc,char *argv[]) {
+int
+main (int argc, char *argv[])
+{
   GstElement *bin;
   GstElementFactory *srcfactory;
   GstElement *src;
@@ -20,63 +22,67 @@ int main(int argc,char *argv[]) {
 
   _gst_plugin_spew = TRUE;
 
-  gst_init(&argc,&argv);
-  gnome_init("Spectrum","0.0.1",argc,argv);
+  gst_init (&argc, &argv);
+  gnome_init ("Spectrum", "0.0.1", argc, argv);
 
-  bin = gst_bin_new("bin");
+  bin = gst_bin_new ("bin");
 
-  srcfactory = gst_element_factory_find("osssrc");
-  spectrumfactory = gst_element_factory_find("gstspectrum");
+  srcfactory = gst_element_factory_find ("osssrc");
+  spectrumfactory = gst_element_factory_find ("gstspectrum");
 
-  src = gst_element_factory_create(srcfactory,"src");
-  gtk_object_set(GTK_OBJECT(src),"bytes_per_read",(gulong)1024,NULL);
-  spectrum = gst_element_factory_create(spectrumfactory,"spectrum");
-  gtk_object_set(GTK_OBJECT(spectrum),"width",256,NULL);
+  src = gst_element_factory_create (srcfactory, "src");
+  gtk_object_set (GTK_OBJECT (src), "bytes_per_read", (gulong) 1024, NULL);
+  spectrum = gst_element_factory_create (spectrumfactory, "spectrum");
+  gtk_object_set (GTK_OBJECT (spectrum), "width", 256, NULL);
 
 
-  gst_bin_add(GST_BIN(bin),GST_ELEMENT(src));
-  gst_bin_add(GST_BIN(bin),GST_ELEMENT(spectrum));
+  gst_bin_add (GST_BIN (bin), GST_ELEMENT (src));
+  gst_bin_add (GST_BIN (bin), GST_ELEMENT (spectrum));
 
-  gst_pad_link(gst_element_get_pad(src,"src"),
-                  gst_element_get_pad(spectrum,"sink"));
+  gst_pad_link (gst_element_get_pad (src, "src"),
+      gst_element_get_pad (spectrum, "sink"));
 
-  spectrumpad = gst_pad_new("sink",GST_PAD_SINK);
-  gst_pad_set_chain_function(spectrumpad,spectrum_chain);
+  spectrumpad = gst_pad_new ("sink", GST_PAD_SINK);
+  gst_pad_set_chain_function (spectrumpad, spectrum_chain);
 
-  gst_pad_link(gst_element_get_pad(spectrum,"src"),spectrumpad);
+  gst_pad_link (gst_element_get_pad (spectrum, "src"), spectrumpad);
 
-  appwindow = gnome_app_new("spectrum","Spectrum");
-  drawingarea = gtk_drawing_area_new();
-  gtk_drawing_area_size(GTK_DRAWING_AREA(drawingarea),256,32);
-  gnome_app_set_contents(GNOME_APP(appwindow),drawingarea);
-  gtk_widget_show_all(appwindow);
+  appwindow = gnome_app_new ("spectrum", "Spectrum");
+  drawingarea = gtk_drawing_area_new ();
+  gtk_drawing_area_size (GTK_DRAWING_AREA (drawingarea), 256, 32);
+  gnome_app_set_contents (GNOME_APP (appwindow), drawingarea);
+  gtk_widget_show_all (appwindow);
 
-  gst_element_set_state(GST_ELEMENT(bin),GST_STATE_READY);
-  gst_element_set_state(GST_ELEMENT(bin),GST_STATE_PLAYING);
+  gst_element_set_state (GST_ELEMENT (bin), GST_STATE_READY);
+  gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PLAYING);
 
-  g_idle_add(idle_func,src);
+  g_idle_add (idle_func, src);
 
-  gtk_main();
+  gtk_main ();
 
   return 0;
 }
 
 
-void spectrum_chain(GstPad *pad,GstData *_data) {
+void
+spectrum_chain (GstPad * pad, GstData * _data)
+{
   GstBuffer *buf = GST_BUFFER (_data);
   gint i;
   guchar *data = buf->data;
 
-  gdk_draw_rectangle(drawingarea->window,drawingarea->style->black_gc,
-                     TRUE,0,0,GST_BUFFER_SIZE(buf),25);
-  for (i=0;i<GST_BUFFER_SIZE(buf);i++) {
-    gdk_draw_rectangle(drawingarea->window,drawingarea->style->white_gc,
-                       TRUE,i,32-data[i],1,data[i]);
+  gdk_draw_rectangle (drawingarea->window, drawingarea->style->black_gc,
+      TRUE, 0, 0, GST_BUFFER_SIZE (buf), 25);
+  for (i = 0; i < GST_BUFFER_SIZE (buf); i++) {
+    gdk_draw_rectangle (drawingarea->window, drawingarea->style->white_gc,
+	TRUE, i, 32 - data[i], 1, data[i]);
   }
-  gst_buffer_unref(buf);
+  gst_buffer_unref (buf);
 }
 
-gboolean idle_func(gpointer data) {
+gboolean
+idle_func (gpointer data)
+{
   /*gst_src_push(GST_SRC(data)); */
   return TRUE;
 }
diff --git a/gst/spectrum/fix_fft.c b/gst/spectrum/fix_fft.c
index a5dd658f..db6c3a82 100644
--- a/gst/spectrum/fix_fft.c
+++ b/gst/spectrum/fix_fft.c
@@ -67,8 +67,8 @@
 
 extern fixed gst_spectrum_Sinewave[N_WAVE];	/* placed at end of this file for clarity */
 extern fixed gst_spectrum_Loudampl[N_LOUD];
-static int gst_spectrum_db_from_ampl(fixed re, fixed im);
-static fixed gst_spectrum_fix_mpy(fixed a, fixed b);
+static int gst_spectrum_db_from_ampl (fixed re, fixed im);
+static fixed gst_spectrum_fix_mpy (fixed a, fixed b);
 
 /*
    fix_fft() - perform fast Fourier transform.
@@ -78,127 +78,119 @@ static fixed gst_spectrum_fix_mpy(fixed a, fixed b);
    size of data = 2**m
    set inverse to 0=dft, 1=idft
  */
-int gst_spectrum_fix_fft(fixed fr[], fixed fi[], int m, int inverse) {
-	int mr, nn, i, j, l, k, istep, n, scale, shift;
-	fixed qr, qi, tr, ti, wr, wi;
-
-	n = 1 << m;
-
-	if (n > N_WAVE)
-		return -1;
-
-	mr = 0;
-	nn = n - 1;
-	scale = 0;
-
-	/* decimation in time - re-order data */
-	for (m = 1; m <= nn; ++m)
-	{
-		l = n;
-		do
-		{
-			l >>= 1;
-		}
-		while (mr + l > nn);
-		mr = (mr & (l - 1)) + l;
-
-		if (mr <= m)
-			continue;
-		tr = fr[m];
-		fr[m] = fr[mr];
-		fr[mr] = tr;
-		ti = fi[m];
-		fi[m] = fi[mr];
-		fi[mr] = ti;
+int
+gst_spectrum_fix_fft (fixed fr[], fixed fi[], int m, int inverse)
+{
+  int mr, nn, i, j, l, k, istep, n, scale, shift;
+  fixed qr, qi, tr, ti, wr, wi;
+
+  n = 1 << m;
+
+  if (n > N_WAVE)
+    return -1;
+
+  mr = 0;
+  nn = n - 1;
+  scale = 0;
+
+  /* decimation in time - re-order data */
+  for (m = 1; m <= nn; ++m) {
+    l = n;
+    do {
+      l >>= 1;
+    }
+    while (mr + l > nn);
+    mr = (mr & (l - 1)) + l;
+
+    if (mr <= m)
+      continue;
+    tr = fr[m];
+    fr[m] = fr[mr];
+    fr[mr] = tr;
+    ti = fi[m];
+    fi[m] = fi[mr];
+    fi[mr] = ti;
+  }
+
+  l = 1;
+  k = LOG2_N_WAVE - 1;
+  while (l < n) {
+    if (inverse) {
+      /* variable scaling, depending upon data */
+      shift = 0;
+      for (i = 0; i < n; ++i) {
+	j = fr[i];
+	if (j < 0)
+	  j = -j;
+	m = fi[i];
+	if (m < 0)
+	  m = -m;
+	if (j > 16383 || m > 16383) {
+	  shift = 1;
+	  break;
 	}
-
-	l = 1;
-	k = LOG2_N_WAVE - 1;
-	while (l < n)
-	{
-		if (inverse)
-		{
-			/* variable scaling, depending upon data */
-			shift = 0;
-			for (i = 0; i < n; ++i)
-			{
-				j = fr[i];
-				if (j < 0)
-					j = -j;
-				m = fi[i];
-				if (m < 0)
-					m = -m;
-				if (j > 16383 || m > 16383)
-				{
-					shift = 1;
-					break;
-				}
-			}
-			if (shift)
-				++scale;
-		}
-		else
-		{
-			/* fixed scaling, for proper normalization -
-			   there will be log2(n) passes, so this
-			   results in an overall factor of 1/n,
-			   distributed to maximize arithmetic accuracy. */
-			shift = 1;
-		}
-		/* it may not be obvious, but the shift will be performed
-		   on each data point exactly once, during this pass. */
-		istep = l << 1;
-		for (m = 0; m < l; ++m)
-		{
-			j = m << k;
-			/* 0 <= j < N_WAVE/2 */
-			wr = gst_spectrum_Sinewave[j + N_WAVE / 4];
-			wi = -gst_spectrum_Sinewave[j];
-			if (inverse)
-				wi = -wi;
-			if (shift)
-			{
-				wr >>= 1;
-				wi >>= 1;
-			}
-			for (i = m; i < n; i += istep)
-			{
-				j = i + l;
-				tr = gst_spectrum_fix_mpy(wr, fr[j]) -
-					gst_spectrum_fix_mpy(wi, fi[j]);
-				ti = gst_spectrum_fix_mpy(wr, fi[j]) +
-					gst_spectrum_fix_mpy(wi, fr[j]);
-				qr = fr[i];
-				qi = fi[i];
-				if (shift)
-				{
-					qr >>= 1;
-					qi >>= 1;
-				}
-				fr[j] = qr - tr;
-				fi[j] = qi - ti;
-				fr[i] = qr + tr;
-				fi[i] = qi + ti;
-			}
-		}
-		--k;
-		l = istep;
+      }
+      if (shift)
+	++scale;
+    } else {
+      /* fixed scaling, for proper normalization -
+         there will be log2(n) passes, so this
+         results in an overall factor of 1/n,
+         distributed to maximize arithmetic accuracy. */
+      shift = 1;
+    }
+    /* it may not be obvious, but the shift will be performed
+       on each data point exactly once, during this pass. */
+    istep = l << 1;
+    for (m = 0; m < l; ++m) {
+      j = m << k;
+      /* 0 <= j < N_WAVE/2 */
+      wr = gst_spectrum_Sinewave[j + N_WAVE / 4];
+      wi = -gst_spectrum_Sinewave[j];
+      if (inverse)
+	wi = -wi;
+      if (shift) {
+	wr >>= 1;
+	wi >>= 1;
+      }
+      for (i = m; i < n; i += istep) {
+	j = i + l;
+	tr = gst_spectrum_fix_mpy (wr, fr[j]) -
+	    gst_spectrum_fix_mpy (wi, fi[j]);
+	ti = gst_spectrum_fix_mpy (wr, fi[j]) +
+	    gst_spectrum_fix_mpy (wi, fr[j]);
+	qr = fr[i];
+	qi = fi[i];
+	if (shift) {
+	  qr >>= 1;
+	  qi >>= 1;
 	}
-
-	return scale;
+	fr[j] = qr - tr;
+	fi[j] = qi - ti;
+	fr[i] = qr + tr;
+	fi[i] = qi + ti;
+      }
+    }
+    --k;
+    l = istep;
+  }
+
+  return scale;
 }
 
 /*      window() - apply a Hanning window       */
-void gst_spectrum_window(fixed fr[], int n) {
-	int i, j, k;
-
-	j = N_WAVE / n;
-	n >>= 1;
-	for (i = 0, k = N_WAVE / 4; i < n; ++i, k += j)
-		FIX_MPY(fr[i], fr[i], 16384 - (gst_spectrum_Sinewave[k] >> 1));
-	n <<= 1;
-	for (k -= j; i < n; ++i, k -= j)
-		FIX_MPY(fr[i], fr[i], 16384 - (gst_spectrum_Sinewave[k] >> 1));
+void
+gst_spectrum_window (fixed fr[], int n)
+{
+  int i, j, k;
+
+  j = N_WAVE / n;
+  n >>= 1;
+  for (i = 0, k = N_WAVE / 4; i < n; ++i, k += j)
+    FIX_MPY (fr[i], fr[i], 16384 - (gst_spectrum_Sinewave[k] >> 1));
+  n <<= 1;
+  for (k -= j; i < n; ++i, k -= j)
+    FIX_MPY (fr[i], fr[i], 16384 - (gst_spectrum_Sinewave[k] >> 1));
 }
 
 /*      fix_loud() - compute loudness of freq-vis components.
@@ -208,73 +200,81 @@ void gst_spectrum_window(fixed fr[], int n) {
    was obtained from an inverse FFT, 0 otherwise.
    loud[] is the loudness, in dB wrt 32767; will be +10 to -N_LOUD.
  */
-void gst_spectrum_fix_loud(fixed loud[], fixed fr[], fixed fi[], int n, int scale_shift) {
-	int i, max;
-
-	max = 0;
-	if (scale_shift > 0)
-		max = 10;
-	scale_shift = (scale_shift + 1) * 6;
-
-	for (i = 0; i < n; ++i)
-	{
-		loud[i] = gst_spectrum_db_from_ampl(fr[i], fi[i]) + scale_shift;
-		if (loud[i] > max)
-			loud[i] = max;
-	}
+void
+gst_spectrum_fix_loud (fixed loud[], fixed fr[], fixed fi[], int n,
+    int scale_shift)
+{
+  int i, max;
+
+  max = 0;
+  if (scale_shift > 0)
+    max = 10;
+  scale_shift = (scale_shift + 1) * 6;
+
+  for (i = 0; i < n; ++i) {
+    loud[i] = gst_spectrum_db_from_ampl (fr[i], fi[i]) + scale_shift;
+    if (loud[i] > max)
+      loud[i] = max;
+  }
 }
 
 /*      db_from_ampl() - find loudness (in dB) from
    the complex amplitude.
  */
-int gst_spectrum_db_from_ampl(fixed re, fixed im) {
-	static long loud2[N_LOUD] =
-	{0};
-	long v;
-	int i;
-
-	if (loud2[0] == 0)
-	{
-		loud2[0] = (long) gst_spectrum_Loudampl[0] * (long) gst_spectrum_Loudampl[0];
-		for (i = 1; i < N_LOUD; ++i)
-		{
-			v = (long) gst_spectrum_Loudampl[i] * (long) gst_spectrum_Loudampl[i];
-			loud2[i] = v;
-			loud2[i - 1] = (loud2[i - 1] + v) / 2;
-		}
-	}
-
-	v = (long) re *(long) re + (long) im *(long) im;
-
-	for (i = 0; i < N_LOUD; ++i)
-		if (loud2[i] <= v)
-			break;
-
-	return (-i);
+int
+gst_spectrum_db_from_ampl (fixed re, fixed im)
+{
+  static long loud2[N_LOUD] = { 0 };
+  long v;
+  int i;
+
+  if (loud2[0] == 0) {
+    loud2[0] =
+	(long) gst_spectrum_Loudampl[0] * (long) gst_spectrum_Loudampl[0];
+    for (i = 1; i < N_LOUD; ++i) {
+      v = (long) gst_spectrum_Loudampl[i] * (long) gst_spectrum_Loudampl[i];
+      loud2[i] = v;
+      loud2[i - 1] = (loud2[i - 1] + v) / 2;
+    }
+  }
+
+  v = (long) re *(long) re + (long) im *(long) im;
+
+  for (i = 0; i < N_LOUD; ++i)
+    if (loud2[i] <= v)
+      break;
+
+  return (-i);
 }
 
 /*
    fix_mpy() - fixed-point multiplication
  */
-fixed gst_spectrum_fix_mpy(fixed a, fixed b) {
-	FIX_MPY(a, a, b);
-	return a;
+fixed
+gst_spectrum_fix_mpy (fixed a, fixed b)
+{
+  FIX_MPY (a, a, b);
+  return a;
 }
 
 /*
    iscale() - scale an integer value by (numer/denom)
  */
-int gst_spectrum_iscale(int value, int numer, int denom) {
-	return (long) value *(long) numer / (long) denom;
+int
+gst_spectrum_iscale (int value, int numer, int denom)
+{
+  return (long) value *(long) numer / (long) denom;
 }
 
 /*
    fix_dot() - dot product of two fixed arrays
  */
-fixed gst_spectrum_fix_dot(fixed * hpa, fixed * pb, int n) {
-	fixed *pa = hpa; /* FIXME */
-	long sum;
-	register fixed a, b;
+fixed
+gst_spectrum_fix_dot (fixed * hpa, fixed * pb, int n)
+{
+  fixed *pa = hpa;		/* FIXME */
+  long sum;
+  register fixed a, b;
 
 /*      seg = FP_SEG(hpa);
    off = FP_OFF(hpa);
@@ -282,174 +282,169 @@ fixed gst_spectrum_fix_dot(fixed * hpa, fixed * pb, int n) {
    off &= 0x000F;
    pa = MK_FP(seg,off);
  */
-	sum = 0L;
-	while (n--)
-	{
-		a = *pa++;
-		b = *pb++;
-		FIX_MPY(a, a, b);
-		sum += a;
-	}
+  sum = 0L;
+  while (n--) {
+    a = *pa++;
+    b = *pb++;
+    FIX_MPY (a, a, b);
+    sum += a;
+  }
 
-	if (sum > 0x7FFF)
-		sum = 0x7FFF;
-	else if (sum < -0x7FFF)
-		sum = -0x7FFF;
+  if (sum > 0x7FFF)
+    sum = 0x7FFF;
+  else if (sum < -0x7FFF)
+    sum = -0x7FFF;
 
-	return (fixed) sum;
+  return (fixed) sum;
 
 }
 
 #if N_WAVE != 1024
 ERROR:N_WAVE != 1024
 #endif
-fixed gst_spectrum_Sinewave[1024] = {
-	0, 201, 402, 603, 804, 1005, 1206, 1406,
-	1607, 1808, 2009, 2209, 2410, 2610, 2811, 3011,
-	3211, 3411, 3611, 3811, 4011, 4210, 4409, 4608,
-	4807, 5006, 5205, 5403, 5601, 5799, 5997, 6195,
-	6392, 6589, 6786, 6982, 7179, 7375, 7571, 7766,
-	7961, 8156, 8351, 8545, 8739, 8932, 9126, 9319,
-	9511, 9703, 9895, 10087, 10278, 10469, 10659, 10849,
-	11038, 11227, 11416, 11604, 11792, 11980, 12166, 12353,
-	12539, 12724, 12909, 13094, 13278, 13462, 13645, 13827,
-	14009, 14191, 14372, 14552, 14732, 14911, 15090, 15268,
-	15446, 15623, 15799, 15975, 16150, 16325, 16499, 16672,
-	16845, 17017, 17189, 17360, 17530, 17699, 17868, 18036,
-	18204, 18371, 18537, 18702, 18867, 19031, 19194, 19357,
-	19519, 19680, 19840, 20000, 20159, 20317, 20474, 20631,
-	20787, 20942, 21096, 21249, 21402, 21554, 21705, 21855,
-	22004, 22153, 22301, 22448, 22594, 22739, 22883, 23027,
-	23169, 23311, 23452, 23592, 23731, 23869, 24006, 24143,
-	24278, 24413, 24546, 24679, 24811, 24942, 25072, 25201,
-	25329, 25456, 25582, 25707, 25831, 25954, 26077, 26198,
-	26318, 26437, 26556, 26673, 26789, 26905, 27019, 27132,
-	27244, 27355, 27466, 27575, 27683, 27790, 27896, 28001,
-	28105, 28208, 28309, 28410, 28510, 28608, 28706, 28802,
-	28897, 28992, 29085, 29177, 29268, 29358, 29446, 29534,
-	29621, 29706, 29790, 29873, 29955, 30036, 30116, 30195,
-	30272, 30349, 30424, 30498, 30571, 30643, 30713, 30783,
-	30851, 30918, 30984, 31049,
-	31113, 31175, 31236, 31297,
-	31356, 31413, 31470, 31525, 31580, 31633, 31684, 31735,
-	31785, 31833, 31880, 31926, 31970, 32014, 32056, 32097,
-	32137, 32176, 32213, 32249, 32284, 32318, 32350, 32382,
-	32412, 32441, 32468, 32495, 32520, 32544, 32567, 32588,
-	32609, 32628, 32646, 32662, 32678, 32692, 32705, 32717,
-	32727, 32736, 32744, 32751, 32757, 32761, 32764, 32766,
-	32767, 32766, 32764, 32761, 32757, 32751, 32744, 32736,
-	32727, 32717, 32705, 32692, 32678, 32662, 32646, 32628,
-	32609, 32588, 32567, 32544, 32520, 32495, 32468, 32441,
-	32412, 32382, 32350, 32318, 32284, 32249, 32213, 32176,
-	32137, 32097, 32056, 32014, 31970, 31926, 31880, 31833,
-	31785, 31735, 31684, 31633, 31580, 31525, 31470, 31413,
-	31356, 31297, 31236, 31175, 31113, 31049, 30984, 30918,
-	30851, 30783, 30713, 30643, 30571, 30498, 30424, 30349,
-	30272, 30195, 30116, 30036, 29955, 29873, 29790, 29706,
-	29621, 29534, 29446, 29358, 29268, 29177, 29085, 28992,
-	28897, 28802, 28706, 28608, 28510, 28410, 28309, 28208,
-	28105, 28001, 27896, 27790, 27683, 27575, 27466, 27355,
-	27244, 27132, 27019, 26905, 26789, 26673, 26556, 26437,
-	26318, 26198, 26077, 25954, 25831, 25707, 25582, 25456,
-	25329, 25201, 25072, 24942, 24811, 24679, 24546, 24413,
-	24278, 24143, 24006, 23869, 23731, 23592, 23452, 23311,
-	23169, 23027, 22883, 22739, 22594, 22448, 22301, 22153,
-	22004, 21855, 21705, 21554, 21402, 21249, 21096, 20942,
-	20787, 20631, 20474, 20317, 20159, 20000, 19840, 19680,
-	19519, 19357, 19194, 19031, 18867, 18702, 18537, 18371,
-	18204, 18036, 17868, 17699, 17530, 17360, 17189, 17017,
-	16845, 16672, 16499, 16325, 16150, 15975, 15799, 15623,
-	15446, 15268, 15090, 14911, 14732, 14552, 14372, 14191,
-	14009, 13827, 13645, 13462, 13278, 13094, 12909, 12724,
-	12539, 12353, 12166, 11980, 11792, 11604, 11416, 11227,
-	11038, 10849, 10659, 10469, 10278, 10087, 9895, 9703,
-	9511, 9319, 9126, 8932, 8739, 8545, 8351, 8156,
-	7961, 7766, 7571, 7375, 7179, 6982, 6786, 6589,
-	6392, 6195, 5997, 5799, 5601, 5403, 5205, 5006,
-	4807, 4608, 4409, 4210, 4011, 3811, 3611, 3411,
-	3211, 3011, 2811, 2610, 2410, 2209, 2009, 1808,
-	1607, 1406, 1206, 1005, 804, 603, 402, 201,
-	0, -201, -402, -603, -804, -1005, -1206, -1406,
-	-1607, -1808, -2009, -2209, -2410, -2610, -2811, -3011,
-	-3211, -3411, -3611, -3811, -4011, -4210, -4409, -4608,
-	-4807, -5006, -5205, -5403, -5601, -5799, -5997, -6195,
-	-6392, -6589, -6786, -6982, -7179, -7375, -7571, -7766,
-	-7961, -8156, -8351, -8545, -8739, -8932, -9126, -9319,
-	-9511, -9703, -9895, -10087, -10278, -10469, -10659, -10849,
-	-11038, -11227, -11416, -11604, -11792, -11980, -12166, -12353,
-	-12539, -12724, -12909, -13094, -13278, -13462, -13645, -13827,
-	-14009, -14191, -14372, -14552, -14732, -14911, -15090, -15268,
-	-15446, -15623, -15799, -15975, -16150, -16325, -16499, -16672,
-	-16845, -17017, -17189, -17360, -17530, -17699, -17868, -18036,
-	-18204, -18371, -18537, -18702, -18867, -19031, -19194, -19357,
-	-19519, -19680, -19840, -20000, -20159, -20317, -20474, -20631,
-	-20787, -20942, -21096, -21249, -21402, -21554, -21705, -21855,
-	-22004, -22153, -22301, -22448, -22594, -22739, -22883, -23027,
-	-23169, -23311, -23452, -23592, -23731, -23869, -24006, -24143,
-	-24278, -24413, -24546, -24679, -24811, -24942, -25072, -25201,
-	-25329, -25456, -25582, -25707, -25831, -25954, -26077, -26198,
-	-26318, -26437, -26556, -26673, -26789, -26905, -27019, -27132,
-	-27244, -27355, -27466, -27575, -27683, -27790, -27896, -28001,
-	-28105, -28208, -28309, -28410, -28510, -28608, -28706, -28802,
-	-28897, -28992, -29085, -29177, -29268, -29358, -29446, -29534,
-	-29621, -29706, -29790, -29873, -29955, -30036, -30116, -30195,
-	-30272, -30349, -30424, -30498, -30571, -30643, -30713, -30783,
-	-30851, -30918, -30984, -31049, -31113, -31175, -31236, -31297,
-	-31356, -31413, -31470, -31525, -31580, -31633, -31684, -31735,
-	-31785, -31833, -31880, -31926, -31970, -32014, -32056, -32097,
-	-32137, -32176, -32213, -32249, -32284, -32318, -32350, -32382,
-	-32412, -32441, -32468, -32495, -32520, -32544, -32567, -32588,
-	-32609, -32628, -32646, -32662, -32678, -32692, -32705, -32717,
-	-32727, -32736, -32744, -32751, -32757, -32761, -32764, -32766,
-	-32767, -32766, -32764, -32761, -32757, -32751, -32744, -32736,
-	-32727, -32717, -32705, -32692, -32678, -32662, -32646, -32628,
-	-32609, -32588, -32567, -32544, -32520, -32495, -32468, -32441,
-	-32412, -32382, -32350, -32318, -32284, -32249, -32213, -32176,
-	-32137, -32097, -32056, -32014, -31970, -31926, -31880, -31833,
-	-31785, -31735, -31684, -31633, -31580, -31525, -31470, -31413,
-	-31356, -31297, -31236, -31175, -31113, -31049, -30984, -30918,
-	-30851, -30783, -30713, -30643, -30571, -30498, -30424, -30349,
-	-30272, -30195, -30116, -30036, -29955, -29873, -29790, -29706,
-	-29621, -29534, -29446, -29358, -29268, -29177, -29085, -28992,
-	-28897, -28802, -28706, -28608, -28510, -28410, -28309, -28208,
-	-28105, -28001, -27896, -27790, -27683, -27575, -27466, -27355,
-	-27244, -27132, -27019, -26905, -26789, -26673, -26556, -26437,
-	-26318, -26198, -26077, -25954, -25831, -25707, -25582, -25456,
-	-25329, -25201, -25072, -24942, -24811, -24679, -24546, -24413,
-	-24278, -24143, -24006, -23869, -23731, -23592, -23452, -23311,
-	-23169, -23027, -22883, -22739, -22594, -22448, -22301, -22153,
-	-22004, -21855, -21705, -21554, -21402, -21249, -21096, -20942,
-	-20787, -20631, -20474, -20317, -20159, -20000, -19840, -19680,
-	-19519, -19357, -19194, -19031, -18867, -18702, -18537, -18371,
-	-18204, -18036, -17868, -17699, -17530, -17360, -17189, -17017,
-	-16845, -16672, -16499, -16325, -16150, -15975, -15799, -15623,
-	-15446, -15268, -15090, -14911, -14732, -14552, -14372, -14191,
-	-14009, -13827, -13645, -13462, -13278, -13094, -12909, -12724,
-	-12539, -12353, -12166, -11980, -11792, -11604, -11416, -11227,
-	-11038, -10849, -10659, -10469, -10278, -10087, -9895, -9703,
-	-9511, -9319, -9126, -8932, -8739, -8545, -8351, -8156,
-	-7961, -7766, -7571, -7375, -7179, -6982, -6786, -6589,
-	-6392, -6195, -5997, -5799, -5601, -5403, -5205, -5006,
-	-4807, -4608, -4409, -4210, -4011, -3811, -3611, -3411,
-	-3211, -3011, -2811, -2610, -2410, -2209, -2009, -1808,
-	-1607, -1406, -1206, -1005, -804, -603, -402, -201,
-};
+    fixed gst_spectrum_Sinewave[1024] = {
+0, 201, 402, 603, 804, 1005, 1206, 1406,
+      1607, 1808, 2009, 2209, 2410, 2610, 2811, 3011,
+      3211, 3411, 3611, 3811, 4011, 4210, 4409, 4608,
+      4807, 5006, 5205, 5403, 5601, 5799, 5997, 6195,
+      6392, 6589, 6786, 6982, 7179, 7375, 7571, 7766,
+      7961, 8156, 8351, 8545, 8739, 8932, 9126, 9319,
+      9511, 9703, 9895, 10087, 10278, 10469, 10659, 10849,
+      11038, 11227, 11416, 11604, 11792, 11980, 12166, 12353,
+      12539, 12724, 12909, 13094, 13278, 13462, 13645, 13827,
+      14009, 14191, 14372, 14552, 14732, 14911, 15090, 15268,
+      15446, 15623, 15799, 15975, 16150, 16325, 16499, 16672,
+      16845, 17017, 17189, 17360, 17530, 17699, 17868, 18036,
+      18204, 18371, 18537, 18702, 18867, 19031, 19194, 19357,
+      19519, 19680, 19840, 20000, 20159, 20317, 20474, 20631,
+      20787, 20942, 21096, 21249, 21402, 21554, 21705, 21855,
+      22004, 22153, 22301, 22448, 22594, 22739, 22883, 23027,
+      23169, 23311, 23452, 23592, 23731, 23869, 24006, 24143,
+      24278, 24413, 24546, 24679, 24811, 24942, 25072, 25201,
+      25329, 25456, 25582, 25707, 25831, 25954, 26077, 26198,
+      26318, 26437, 26556, 26673, 26789, 26905, 27019, 27132,
+      27244, 27355, 27466, 27575, 27683, 27790, 27896, 28001,
+      28105, 28208, 28309, 28410, 28510, 28608, 28706, 28802,
+      28897, 28992, 29085, 29177, 29268, 29358, 29446, 29534,
+      29621, 29706, 29790, 29873, 29955, 30036, 30116, 30195,
+      30272, 30349, 30424, 30498, 30571, 30643, 30713, 30783,
+      30851, 30918, 30984, 31049,
+      31113, 31175, 31236, 31297,
+      31356, 31413, 31470, 31525, 31580, 31633, 31684, 31735,
+      31785, 31833, 31880, 31926, 31970, 32014, 32056, 32097,
+      32137, 32176, 32213, 32249, 32284, 32318, 32350, 32382,
+      32412, 32441, 32468, 32495, 32520, 32544, 32567, 32588,
+      32609, 32628, 32646, 32662, 32678, 32692, 32705, 32717,
+      32727, 32736, 32744, 32751, 32757, 32761, 32764, 32766,
+      32767, 32766, 32764, 32761, 32757, 32751, 32744, 32736,
+      32727, 32717, 32705, 32692, 32678, 32662, 32646, 32628,
+      32609, 32588, 32567, 32544, 32520, 32495, 32468, 32441,
+      32412, 32382, 32350, 32318, 32284, 32249, 32213, 32176,
+      32137, 32097, 32056, 32014, 31970, 31926, 31880, 31833,
+      31785, 31735, 31684, 31633, 31580, 31525, 31470, 31413,
+      31356, 31297, 31236, 31175, 31113, 31049, 30984, 30918,
+      30851, 30783, 30713, 30643, 30571, 30498, 30424, 30349,
+      30272, 30195, 30116, 30036, 29955, 29873, 29790, 29706,
+      29621, 29534, 29446, 29358, 29268, 29177, 29085, 28992,
+      28897, 28802, 28706, 28608, 28510, 28410, 28309, 28208,
+      28105, 28001, 27896, 27790, 27683, 27575, 27466, 27355,
+      27244, 27132, 27019, 26905, 26789, 26673, 26556, 26437,
+      26318, 26198, 26077, 25954, 25831, 25707, 25582, 25456,
+      25329, 25201, 25072, 24942, 24811, 24679, 24546, 24413,
+      24278, 24143, 24006, 23869, 23731, 23592, 23452, 23311,
+      23169, 23027, 22883, 22739, 22594, 22448, 22301, 22153,
+      22004, 21855, 21705, 21554, 21402, 21249, 21096, 20942,
+      20787, 20631, 20474, 20317, 20159, 20000, 19840, 19680,
+      19519, 19357, 19194, 19031, 18867, 18702, 18537, 18371,
+      18204, 18036, 17868, 17699, 17530, 17360, 17189, 17017,
+      16845, 16672, 16499, 16325, 16150, 15975, 15799, 15623,
+      15446, 15268, 15090, 14911, 14732, 14552, 14372, 14191,
+      14009, 13827, 13645, 13462, 13278, 13094, 12909, 12724,
+      12539, 12353, 12166, 11980, 11792, 11604, 11416, 11227,
+      11038, 10849, 10659, 10469, 10278, 10087, 9895, 9703,
+      9511, 9319, 9126, 8932, 8739, 8545, 8351, 8156,
+      7961, 7766, 7571, 7375, 7179, 6982, 6786, 6589,
+      6392, 6195, 5997, 5799, 5601, 5403, 5205, 5006,
+      4807, 4608, 4409, 4210, 4011, 3811, 3611, 3411,
+      3211, 3011, 2811, 2610, 2410, 2209, 2009, 1808,
+      1607, 1406, 1206, 1005, 804, 603, 402, 201,
+      0, -201, -402, -603, -804, -1005, -1206, -1406,
+      -1607, -1808, -2009, -2209, -2410, -2610, -2811, -3011,
+      -3211, -3411, -3611, -3811, -4011, -4210, -4409, -4608,
+      -4807, -5006, -5205, -5403, -5601, -5799, -5997, -6195,
+      -6392, -6589, -6786, -6982, -7179, -7375, -7571, -7766,
+      -7961, -8156, -8351, -8545, -8739, -8932, -9126, -9319,
+      -9511, -9703, -9895, -10087, -10278, -10469, -10659, -10849,
+      -11038, -11227, -11416, -11604, -11792, -11980, -12166, -12353,
+      -12539, -12724, -12909, -13094, -13278, -13462, -13645, -13827,
+      -14009, -14191, -14372, -14552, -14732, -14911, -15090, -15268,
+      -15446, -15623, -15799, -15975, -16150, -16325, -16499, -16672,
+      -16845, -17017, -17189, -17360, -17530, -17699, -17868, -18036,
+      -18204, -18371, -18537, -18702, -18867, -19031, -19194, -19357,
+      -19519, -19680, -19840, -20000, -20159, -20317, -20474, -20631,
+      -20787, -20942, -21096, -21249, -21402, -21554, -21705, -21855,
+      -22004, -22153, -22301, -22448, -22594, -22739, -22883, -23027,
+      -23169, -23311, -23452, -23592, -23731, -23869, -24006, -24143,
+      -24278, -24413, -24546, -24679, -24811, -24942, -25072, -25201,
+      -25329, -25456, -25582, -25707, -25831, -25954, -26077, -26198,
+      -26318, -26437, -26556, -26673, -26789, -26905, -27019, -27132,
+      -27244, -27355, -27466, -27575, -27683, -27790, -27896, -28001,
+      -28105, -28208, -28309, -28410, -28510, -28608, -28706, -28802,
+      -28897, -28992, -29085, -29177, -29268, -29358, -29446, -29534,
+      -29621, -29706, -29790, -29873, -29955, -30036, -30116, -30195,
+      -30272, -30349, -30424, -30498, -30571, -30643, -30713, -30783,
+      -30851, -30918, -30984, -31049, -31113, -31175, -31236, -31297,
+      -31356, -31413, -31470, -31525, -31580, -31633, -31684, -31735,
+      -31785, -31833, -31880, -31926, -31970, -32014, -32056, -32097,
+      -32137, -32176, -32213, -32249, -32284, -32318, -32350, -32382,
+      -32412, -32441, -32468, -32495, -32520, -32544, -32567, -32588,
+      -32609, -32628, -32646, -32662, -32678, -32692, -32705, -32717,
+      -32727, -32736, -32744, -32751, -32757, -32761, -32764, -32766,
+      -32767, -32766, -32764, -32761, -32757, -32751, -32744, -32736,
+      -32727, -32717, -32705, -32692, -32678, -32662, -32646, -32628,
+      -32609, -32588, -32567, -32544, -32520, -32495, -32468, -32441,
+      -32412, -32382, -32350, -32318, -32284, -32249, -32213, -32176,
+      -32137, -32097, -32056, -32014, -31970, -31926, -31880, -31833,
+      -31785, -31735, -31684, -31633, -31580, -31525, -31470, -31413,
+      -31356, -31297, -31236, -31175, -31113, -31049, -30984, -30918,
+      -30851, -30783, -30713, -30643, -30571, -30498, -30424, -30349,
+      -30272, -30195, -30116, -30036, -29955, -29873, -29790, -29706,
+      -29621, -29534, -29446, -29358, -29268, -29177, -29085, -28992,
+      -28897, -28802, -28706, -28608, -28510, -28410, -28309, -28208,
+      -28105, -28001, -27896, -27790, -27683, -27575, -27466, -27355,
+      -27244, -27132, -27019, -26905, -26789, -26673, -26556, -26437,
+      -26318, -26198, -26077, -25954, -25831, -25707, -25582, -25456,
+      -25329, -25201, -25072, -24942, -24811, -24679, -24546, -24413,
+      -24278, -24143, -24006, -23869, -23731, -23592, -23452, -23311,
+      -23169, -23027, -22883, -22739, -22594, -22448, -22301, -22153,
+      -22004, -21855, -21705, -21554, -21402, -21249, -21096, -20942,
+      -20787, -20631, -20474, -20317, -20159, -20000, -19840, -19680,
+      -19519, -19357, -19194, -19031, -18867, -18702, -18537, -18371,
+      -18204, -18036, -17868, -17699, -17530, -17360, -17189, -17017,
+      -16845, -16672, -16499, -16325, -16150, -15975, -15799, -15623,
+      -15446, -15268, -15090, -14911, -14732, -14552, -14372, -14191,
+      -14009, -13827, -13645, -13462, -13278, -13094, -12909, -12724,
+      -12539, -12353, -12166, -11980, -11792, -11604, -11416, -11227,
+      -11038, -10849, -10659, -10469, -10278, -10087, -9895, -9703,
+      -9511, -9319, -9126, -8932, -8739, -8545, -8351, -8156,
+      -7961, -7766, -7571, -7375, -7179, -6982, -6786, -6589,
+      -6392, -6195, -5997, -5799, -5601, -5403, -5205, -5006,
+      -4807, -4608, -4409, -4210, -4011, -3811, -3611, -3411,
+      -3211, -3011, -2811, -2610, -2410, -2209, -2009, -1808,
+      -1607, -1406, -1206, -1005, -804, -603, -402, -201,};
 
 #if N_LOUD != 100
 ERROR:N_LOUD != 100
 #endif
-fixed gst_spectrum_Loudampl[100] = {
-	32767, 29203, 26027, 23197, 20674, 18426, 16422, 14636,
-	13044, 11626, 10361, 9234, 8230, 7335, 6537, 5826,
-	5193, 4628, 4125, 3676, 3276, 2920, 2602, 2319,
-	2067, 1842, 1642, 1463, 1304, 1162, 1036, 923,
-	823, 733, 653, 582, 519, 462, 412, 367,
-	327, 292, 260, 231, 206, 184, 164, 146,
-	130, 116, 103, 92, 82, 73, 65, 58,
-	51, 46, 41, 36, 32, 29, 26, 23,
-	20, 18, 16, 14, 13, 11, 10, 9,
-	8, 7, 6, 5, 5, 4, 4, 3,
-	3, 2, 2, 2, 2, 1, 1, 1,
-	1, 1, 1, 0, 0, 0, 0, 0,
-	0, 0, 0, 0,
-};
+    fixed gst_spectrum_Loudampl[100] = {
+32767, 29203, 26027, 23197, 20674, 18426, 16422, 14636,
+      13044, 11626, 10361, 9234, 8230, 7335, 6537, 5826,
+      5193, 4628, 4125, 3676, 3276, 2920, 2602, 2319,
+      2067, 1842, 1642, 1463, 1304, 1162, 1036, 923,
+      823, 733, 653, 582, 519, 462, 412, 367,
+      327, 292, 260, 231, 206, 184, 164, 146,
+      130, 116, 103, 92, 82, 73, 65, 58,
+      51, 46, 41, 36, 32, 29, 26, 23,
+      20, 18, 16, 14, 13, 11, 10, 9,
+      8, 7, 6, 5, 5, 4, 4, 3,
+      3, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0,};
diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c
index 920d69ee..aa309f1c 100644
--- a/gst/spectrum/gstspectrum.c
+++ b/gst/spectrum/gstspectrum.c
@@ -25,40 +25,44 @@
 #include "gstspectrum.h"
 
 /* elementfactory information */
-static GstElementDetails gst_spectrum_details = GST_ELEMENT_DETAILS (
-  "Spectrum analyzer",
-  "Filter/Analyzer/Audio",
-  "Run an FFT on the audio signal, output spectrum data",
-  "Erik Walthinsen <omega@cse.ogi.edu>"
-);
+static GstElementDetails gst_spectrum_details =
+GST_ELEMENT_DETAILS ("Spectrum analyzer",
+    "Filter/Analyzer/Audio",
+    "Run an FFT on the audio signal, output spectrum data",
+    "Erik Walthinsen <omega@cse.ogi.edu>");
 
 /* Spectrum signals and args */
-enum {
+enum
+{
   /* FILL ME */
   LAST_SIGNAL
 };
 
-enum {
+enum
+{
   ARG_0,
   ARG_WIDTH,
 };
 
 
-static void	gst_spectrum_base_init	(gpointer g_class);
-static void	gst_spectrum_class_init	(GstSpectrumClass *klass);
-static void	gst_spectrum_init	(GstSpectrum *spectrum);
+static void gst_spectrum_base_init (gpointer g_class);
+static void gst_spectrum_class_init (GstSpectrumClass * klass);
+static void gst_spectrum_init (GstSpectrum * spectrum);
 
-static void	gst_spectrum_set_property	(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
+static void gst_spectrum_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
 
-static void	gst_spectrum_chain	(GstPad *pad, GstData *_data);
+static void gst_spectrum_chain (GstPad * pad, GstData * _data);
 
 #define fixed short
-int gst_spectrum_fix_fft(fixed fr[], fixed fi[], int m, int inverse);
-void gst_spectrum_fix_loud(fixed loud[], fixed fr[], fixed fi[], int n, int scale_shift);
-void gst_spectrum_window(fixed fr[], int n);
+int gst_spectrum_fix_fft (fixed fr[], fixed fi[], int m, int inverse);
+void gst_spectrum_fix_loud (fixed loud[], fixed fr[], fixed fi[], int n,
+    int scale_shift);
+void gst_spectrum_window (fixed fr[], int n);
 
 
 static GstElementClass *parent_class = NULL;
+
 /*static guint gst_spectrum_signals[LAST_SIGNAL] = { 0 }; */
 
 GType
@@ -68,17 +72,19 @@ gst_spectrum_get_type (void)
 
   if (!spectrum_type) {
     static const GTypeInfo spectrum_info = {
-      sizeof(GstSpectrumClass),
+      sizeof (GstSpectrumClass),
       gst_spectrum_base_init,
       NULL,
-      (GClassInitFunc)gst_spectrum_class_init,
+      (GClassInitFunc) gst_spectrum_class_init,
       NULL,
       NULL,
-      sizeof(GstSpectrum),
+      sizeof (GstSpectrum),
       0,
-      (GInstanceInitFunc)gst_spectrum_init,
+      (GInstanceInitFunc) gst_spectrum_init,
     };
-    spectrum_type = g_type_register_static(GST_TYPE_ELEMENT, "GstSpectrum", &spectrum_info, 0);
+    spectrum_type =
+	g_type_register_static (GST_TYPE_ELEMENT, "GstSpectrum", &spectrum_info,
+	0);
   }
   return spectrum_type;
 }
@@ -91,41 +97,40 @@ gst_spectrum_base_init (gpointer g_class)
   gst_element_class_set_details (element_class, &gst_spectrum_details);
 }
 static void
-gst_spectrum_class_init (GstSpectrumClass *klass)
+gst_spectrum_class_init (GstSpectrumClass * klass)
 {
   GObjectClass *gobject_class;
 
-  gobject_class = (GObjectClass*)klass;
+  gobject_class = (GObjectClass *) klass;
 
-  parent_class = g_type_class_ref(GST_TYPE_ELEMENT);
+  parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
 
-  g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_WIDTH,
-    g_param_spec_int("width","width","width",
-                     G_MININT,G_MAXINT,0,G_PARAM_WRITABLE)); /* CHECKME */
+  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_WIDTH, g_param_spec_int ("width", "width", "width", G_MININT, G_MAXINT, 0, G_PARAM_WRITABLE));	/* CHECKME */
 
   gobject_class->set_property = gst_spectrum_set_property;
 }
 
 static void
-gst_spectrum_init (GstSpectrum *spectrum)
+gst_spectrum_init (GstSpectrum * spectrum)
 {
-  spectrum->sinkpad = gst_pad_new("sink",GST_PAD_SINK);
-  gst_element_add_pad(GST_ELEMENT(spectrum),spectrum->sinkpad);
-  gst_pad_set_chain_function(spectrum->sinkpad,gst_spectrum_chain);
-  spectrum->srcpad = gst_pad_new("src",GST_PAD_SRC);
-  gst_element_add_pad(GST_ELEMENT(spectrum),spectrum->srcpad);
+  spectrum->sinkpad = gst_pad_new ("sink", GST_PAD_SINK);
+  gst_element_add_pad (GST_ELEMENT (spectrum), spectrum->sinkpad);
+  gst_pad_set_chain_function (spectrum->sinkpad, gst_spectrum_chain);
+  spectrum->srcpad = gst_pad_new ("src", GST_PAD_SRC);
+  gst_element_add_pad (GST_ELEMENT (spectrum), spectrum->srcpad);
 
   spectrum->width = 75;
 }
 
 static void
-gst_spectrum_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+gst_spectrum_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
 {
   GstSpectrum *spectrum;
 
   /* it's not null if we got it, but it might not be ours */
-  g_return_if_fail(GST_IS_SPECTRUM(object));
-  spectrum = GST_SPECTRUM(object);
+  g_return_if_fail (GST_IS_SPECTRUM (object));
+  spectrum = GST_SPECTRUM (object);
 
   switch (prop_id) {
     case ARG_WIDTH:
@@ -137,48 +142,49 @@ gst_spectrum_set_property (GObject *object, guint prop_id, const GValue *value,
 }
 
 static void
-gst_spectrum_chain (GstPad *pad, GstData *_data)
+gst_spectrum_chain (GstPad * pad, GstData * _data)
 {
   GstBuffer *buf = GST_BUFFER (_data);
   GstSpectrum *spectrum;
   gint spec_base, spec_len;
   gint16 *re, *im, *loud;
   gint16 *samples;
-  gint step,pos,i;
+  gint step, pos, i;
   guchar *spect;
   GstBuffer *newbuf;
 
-  g_return_if_fail(pad != NULL);
-  g_return_if_fail(GST_IS_PAD(pad));
-  g_return_if_fail(buf != NULL);
+  g_return_if_fail (pad != NULL);
+  g_return_if_fail (GST_IS_PAD (pad));
+  g_return_if_fail (buf != NULL);
 
   spectrum = GST_SPECTRUM (GST_OBJECT_PARENT (pad));
 
-  samples = (gint16 *)GST_BUFFER_DATA(buf);
+  samples = (gint16 *) GST_BUFFER_DATA (buf);
 
   spec_base = 8;
   spec_len = 1024;
 
-  im = g_malloc(spec_len * sizeof(gint16));
-  g_return_if_fail(im != NULL);
-  loud = g_malloc(spec_len * sizeof(gint16));
-  g_return_if_fail(loud != NULL);
+  im = g_malloc (spec_len * sizeof (gint16));
+  g_return_if_fail (im != NULL);
+  loud = g_malloc (spec_len * sizeof (gint16));
+  g_return_if_fail (loud != NULL);
 
-  memset(im,0,spec_len * sizeof(gint16));
+  memset (im, 0, spec_len * sizeof (gint16));
   /*if (spectrum->meta->channels == 2) { */
-    re = g_malloc(spec_len * sizeof(gint16));
-    for (i=0;i<spec_len;i++)
-      re[i] = (samples[(i*2)] + samples[(i*2)+1]) >> 1;
+  re = g_malloc (spec_len * sizeof (gint16));
+  for (i = 0; i < spec_len; i++)
+    re[i] = (samples[(i * 2)] + samples[(i * 2) + 1]) >> 1;
   /*} else */
   /*  re = samples; */
-  gst_spectrum_window(re,spec_len);
-  gst_spectrum_fix_fft(re,im,spec_base,FALSE);
-  gst_spectrum_fix_loud(loud,re,im,spec_len,0);
-  if (re != samples) g_free(re);
-  g_free(im);
-  step = spec_len / (spectrum->width*2);
-  spect = (guchar *)g_malloc(spectrum->width);
-  for (i=0,pos=0;i<spectrum->width;i++,pos += step) {
+  gst_spectrum_window (re, spec_len);
+  gst_spectrum_fix_fft (re, im, spec_base, FALSE);
+  gst_spectrum_fix_loud (loud, re, im, spec_len, 0);
+  if (re != samples)
+    g_free (re);
+  g_free (im);
+  step = spec_len / (spectrum->width * 2);
+  spect = (guchar *) g_malloc (spectrum->width);
+  for (i = 0, pos = 0; i < spectrum->width; i++, pos += step) {
     if (loud[pos] > -60)
       spect[i] = (loud[pos] + 60) / 2;
     else
@@ -186,32 +192,27 @@ gst_spectrum_chain (GstPad *pad, GstData *_data)
 /*    if (spect[i] > 15); */
 /*      spect[i] = 15; */
   }
-  g_free(loud);
-  gst_buffer_unref(buf);
+  g_free (loud);
+  gst_buffer_unref (buf);
 /*  g_free(samples); */
 
-  newbuf = gst_buffer_new();
-  g_return_if_fail(newbuf != NULL);
-  GST_BUFFER_DATA(newbuf) = spect;
-  GST_BUFFER_SIZE(newbuf) = spectrum->width;
+  newbuf = gst_buffer_new ();
+  g_return_if_fail (newbuf != NULL);
+  GST_BUFFER_DATA (newbuf) = spect;
+  GST_BUFFER_SIZE (newbuf) = spectrum->width;
 
-  gst_pad_push(spectrum->srcpad,GST_DATA (newbuf));
+  gst_pad_push (spectrum->srcpad, GST_DATA (newbuf));
 }
 
 static gboolean
-plugin_init (GstPlugin *plugin)
+plugin_init (GstPlugin * plugin)
 {
-  return gst_element_register (plugin, "spectrum", GST_RANK_NONE, GST_TYPE_SPECTRUM);
+  return gst_element_register (plugin, "spectrum", GST_RANK_NONE,
+      GST_TYPE_SPECTRUM);
 }
 
-GST_PLUGIN_DEFINE (
-  GST_VERSION_MAJOR,
-  GST_VERSION_MINOR,
-  "spectrum",
-  "Run an FFT on the audio signal, output spectrum data",
-  plugin_init,
-  VERSION,
-  GST_LICENSE,
-  GST_PACKAGE,
-  GST_ORIGIN
-)
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    "spectrum",
+    "Run an FFT on the audio signal, output spectrum data",
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
diff --git a/gst/spectrum/gstspectrum.h b/gst/spectrum/gstspectrum.h
index 8cc546ec..23c4ef4b 100644
--- a/gst/spectrum/gstspectrum.h
+++ b/gst/spectrum/gstspectrum.h
@@ -26,8 +26,9 @@
 
 
 #ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+extern "C"
+{
+#endif				/* __cplusplus */
 
 
 #define GST_TYPE_SPECTRUM \
@@ -41,27 +42,29 @@ extern "C" {
 #define GST_IS_SPECTRUM_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SPECTRUM))
 
-typedef struct _GstSpectrum GstSpectrum;
-typedef struct _GstSpectrumClass GstSpectrumClass;
+  typedef struct _GstSpectrum GstSpectrum;
+  typedef struct _GstSpectrumClass GstSpectrumClass;
 
-struct _GstSpectrum {
-  GstElement element;
+  struct _GstSpectrum
+  {
+    GstElement element;
 
-  GstPad *sinkpad,*srcpad;
+    GstPad *sinkpad, *srcpad;
 
-  gint width;
-};
+    gint width;
+  };
 
-struct _GstSpectrumClass {
-  GstElementClass parent_class;
-};
+  struct _GstSpectrumClass
+  {
+    GstElementClass parent_class;
+  };
 
-GType gst_spectrum_get_type(void);
+  GType gst_spectrum_get_type (void);
 
 
 #ifdef __cplusplus
 }
-#endif /* __cplusplus */
+#endif				/* __cplusplus */
 
 
-#endif /* __GST_SPECTRUM_H__ */
+#endif				/* __GST_SPECTRUM_H__ */