hist.{c,h}: redo indentation

diff --git a/src/hist.c b/src/hist.c
index 0259cc25cc0693aa1ba57147729af76dae72f7ef..e97287b411c40afc813399a463787c2dc011e19e 100644 (file)
--- a/src/hist.c
+++ b/src/hist.c
@@ -1,20 +1,20 @@
 /*
-        Copyright (C) 2003 Paul Brossier
+   Copyright (C) 2003 Paul Brossier
 
-        This program is free software; you can redistribute it and/or modify
-        it under the terms of the GNU General Public License as published by
-        the Free Software Foundation; either version 2 of the License, or
-        (at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-        This program is distributed in the hope that it will be useful,
-        but WITHOUT ANY WARRANTY; without even the implied warranty of
-        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-        GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-        You should have received a copy of the GNU General Public License
-        along with this program; if not, write to the Free Software
-        Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-        */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
 
 #include "aubio_priv.h"
 #include "sample.h"
@@ -27,138 +27,131 @@
  */
 
 struct _aubio_hist_t {
-       fvec_t * hist;
-       uint_t nelems;
-       uint_t channels;
-       fvec_t * cent;
-       aubio_scale_t *scaler;
+  fvec_t * hist;
+  uint_t nelems;
+  uint_t channels;
+  fvec_t * cent;
+  aubio_scale_t *scaler;
 };
 
 /**
  * Object creation/deletion calls
  */
 aubio_hist_t * new_aubio_hist (smpl_t ilow, smpl_t ihig, uint_t nelems, uint_t channels){
-       aubio_hist_t * s = AUBIO_NEW(aubio_hist_t);
-       smpl_t step = (ihig-ilow)/(smpl_t)(nelems);
-       smpl_t accum = step;
-       uint_t i;
-       s->channels = channels;
-       s->nelems = nelems;
+  aubio_hist_t * s = AUBIO_NEW(aubio_hist_t);
+  smpl_t step = (ihig-ilow)/(smpl_t)(nelems);
+  smpl_t accum = step;
+  uint_t i;
+  s->channels = channels;
+  s->nelems = nelems;
   s->hist = new_fvec(nelems, channels);
-       s->cent = new_fvec(nelems, 1);
-       
-       /* use scale to map ilow/ihig -> 0/nelems */
-       s->scaler = new_aubio_scale(ilow,ihig,0,nelems);
-       /* calculate centers now once */
-       s->cent->data[0][0] = ilow + 0.5 * step;
-       for (i=1; i < s->nelems; i++, accum+=step )
-               s->cent->data[0][i] = s->cent->data[0][0] + accum;
-       
-       return s;       
+  s->cent = new_fvec(nelems, 1);
+
+  /* use scale to map ilow/ihig -> 0/nelems */
+  s->scaler = new_aubio_scale(ilow,ihig,0,nelems);
+  /* calculate centers now once */
+  s->cent->data[0][0] = ilow + 0.5 * step;
+  for (i=1; i < s->nelems; i++, accum+=step )
+    s->cent->data[0][i] = s->cent->data[0][0] + accum;
+
+  return s;
 }
 
 void del_aubio_hist(aubio_hist_t *s) {
   del_fvec(s->hist);
-       del_fvec(s->cent);
-       del_aubio_scale(s->scaler);
-       AUBIO_FREE(s);
+  del_fvec(s->cent);
+  del_aubio_scale(s->scaler);
+  AUBIO_FREE(s);
 }
 
 /***
  * do it
  */
-void aubio_hist_do (aubio_hist_t *s, fvec_t *input) 
-{
-       uint_t i,j;
-       sint_t tmp = 0;
-       aubio_scale_do(s->scaler, input);
-       /* reset data */
-       for (i=0; i < s->channels; i++)
-               for (j=0; j < s->nelems; j++) 
-                       s->hist->data[i][j] = 0;
-       /* run accum */
-       for (i=0; i < input->channels; i++)
-               for (j=0;  j < input->length; j++)
-               {
-                       tmp = (sint_t)FLOOR(input->data[i][j]);
-                       if ((tmp >= 0) && (tmp < (sint_t)s->nelems))
-                               s->hist->data[i][tmp] += 1;
-               }
+void aubio_hist_do (aubio_hist_t *s, fvec_t *input) {
+  uint_t i,j;
+  sint_t tmp = 0;
+  aubio_scale_do(s->scaler, input);
+  /* reset data */
+  for (i=0; i < s->channels; i++)
+    for (j=0; j < s->nelems; j++)
+      s->hist->data[i][j] = 0;
+  /* run accum */
+  for (i=0; i < input->channels; i++)
+    for (j=0;  j < input->length; j++)
+    {
+      tmp = (sint_t)FLOOR(input->data[i][j]);
+      if ((tmp >= 0) && (tmp < (sint_t)s->nelems))
+        s->hist->data[i][tmp] += 1;
+    }
 }
 
-void aubio_hist_do_notnull (aubio_hist_t *s, fvec_t *input) 
-{
-       uint_t i,j;
-       sint_t tmp = 0;
-       aubio_scale_do(s->scaler, input);
-       /* reset data */
-       for (i=0; i < s->channels; i++)
-               for (j=0; j < s->nelems; j++) 
-                       s->hist->data[i][j] = 0;
-       /* run accum */
-       for (i=0; i < input->channels; i++)
-               for (j=0;  j < input->length; j++) 
-               {
-                       if (input->data[i][j] != 0) {
-                               tmp = (sint_t)FLOOR(input->data[i][j]);
-                               if ((tmp >= 0) && (tmp < (sint_t)s->nelems))
-                                       s->hist->data[i][tmp] += 1;
-                       }
-               }
+void aubio_hist_do_notnull (aubio_hist_t *s, fvec_t *input) {
+  uint_t i,j;
+  sint_t tmp = 0;
+  aubio_scale_do(s->scaler, input);
+  /* reset data */
+  for (i=0; i < s->channels; i++)
+    for (j=0; j < s->nelems; j++)
+      s->hist->data[i][j] = 0;
+  /* run accum */
+  for (i=0; i < input->channels; i++)
+    for (j=0;  j < input->length; j++) {
+      if (input->data[i][j] != 0) {
+        tmp = (sint_t)FLOOR(input->data[i][j]);
+        if ((tmp >= 0) && (tmp < (sint_t)s->nelems))
+          s->hist->data[i][tmp] += 1;
+      }
+    }
 }
 
 
-void aubio_hist_dyn_notnull (aubio_hist_t *s, fvec_t *input) 
-{
-       uint_t i,j;
-       sint_t tmp = 0;
-       smpl_t ilow = vec_min(input);
-       smpl_t ihig = vec_max(input);
-       smpl_t step = (ihig-ilow)/(smpl_t)(s->nelems);
-       
-       /* readapt */
-       aubio_scale_set(s->scaler, ilow, ihig, 0, s->nelems);
-
-       /* recalculate centers */
-       s->cent->data[0][0] = ilow + 0.5f * step;
-       for (i=1; i < s->nelems; i++)
-               s->cent->data[0][i] = s->cent->data[0][0] + i * step;
-
-       /* scale */     
-       aubio_scale_do(s->scaler, input);
-
-       /* reset data */
-       for (i=0; i < s->channels; i++)
-               for (j=0; j < s->nelems; j++) 
-                       s->hist->data[i][j] = 0;
-       /* run accum */
-       for (i=0; i < input->channels; i++)
-               for (j=0;  j < input->length; j++) 
-               {
-                       if (input->data[i][j] != 0) {
-                               tmp = (sint_t)FLOOR(input->data[i][j]);
-                               if ((tmp >= 0) && (tmp < (sint_t)s->nelems))
-                                       s->hist->data[i][tmp] += 1;
-                       }
-               }
+void aubio_hist_dyn_notnull (aubio_hist_t *s, fvec_t *input) {
+  uint_t i,j;
+  sint_t tmp = 0;
+  smpl_t ilow = vec_min(input);
+  smpl_t ihig = vec_max(input);
+  smpl_t step = (ihig-ilow)/(smpl_t)(s->nelems);
+
+  /* readapt */
+  aubio_scale_set(s->scaler, ilow, ihig, 0, s->nelems);
+
+  /* recalculate centers */
+  s->cent->data[0][0] = ilow + 0.5f * step;
+  for (i=1; i < s->nelems; i++)
+    s->cent->data[0][i] = s->cent->data[0][0] + i * step;
+
+  /* scale */
+  aubio_scale_do(s->scaler, input);
+
+  /* reset data */
+  for (i=0; i < s->channels; i++)
+    for (j=0; j < s->nelems; j++)
+      s->hist->data[i][j] = 0;
+  /* run accum */
+  for (i=0; i < input->channels; i++)
+    for (j=0;  j < input->length; j++) {
+      if (input->data[i][j] != 0) {
+        tmp = (sint_t)FLOOR(input->data[i][j]);
+        if ((tmp >= 0) && (tmp < (sint_t)s->nelems))
+          s->hist->data[i][tmp] += 1;
+      }
+    }
 }
 
-void aubio_hist_weight (aubio_hist_t *s) 
-{
-       uint_t i,j;
-       for (i=0; i < s->channels; i++)
-               for (j=0; j < s->nelems; j++) {
-                       s->hist->data[i][j] *= s->cent->data[0][j];
-               }
+void aubio_hist_weight (aubio_hist_t *s) {
+  uint_t i,j;
+  for (i=0; i < s->channels; i++)
+    for (j=0; j < s->nelems; j++) {
+      s->hist->data[i][j] *= s->cent->data[0][j];
+    }
 }
 
-smpl_t aubio_hist_mean (aubio_hist_t *s) 
-{
-       uint_t i,j;
-       smpl_t tmp = 0.0f;
-       for (i=0; i < s->channels; i++)
-               for (j=0; j < s->nelems; j++)
-                       tmp += s->hist->data[i][j];
-       return tmp/(smpl_t)(s->nelems);
+smpl_t aubio_hist_mean (aubio_hist_t *s) {
+  uint_t i,j;
+  smpl_t tmp = 0.0f;
+  for (i=0; i < s->channels; i++)
+    for (j=0; j < s->nelems; j++)
+      tmp += s->hist->data[i][j];
+  return tmp/(smpl_t)(s->nelems);
 }
 

diff --git a/src/hist.h b/src/hist.h
index 223c8e1068ebf3d7829f883c7e3536d5be5d7327..e38066ccace883e4fa811f211cd9564bc0cbe6e5 100644 (file)
--- a/src/hist.h
+++ b/src/hist.h
@@ -14,7 +14,7 @@
         You should have received a copy of the GNU General Public License
         along with this program; if not, write to the Free Software
         Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-        */
+*/
 
 /** @file
  *
@@ -33,11 +33,11 @@ extern "C" {
 /** histogram object */
 typedef struct _aubio_hist_t aubio_hist_t;
 
-/** histogram creation 
+/** histogram creation
  * \param flow minimum input
  * \param fhig maximum input
  * \param nelems number of histogram columns
- * \param channels number of channels 
+ * \param channels number of channels
  */
 aubio_hist_t * new_aubio_hist(smpl_t flow, smpl_t fhig, uint_t nelems, uint_t channels);
 /** histogram deletion */
@@ -47,9 +47,9 @@ void aubio_hist_do(aubio_hist_t *s, fvec_t * input);
 /** compute the histogram ignoring null elements */
 void aubio_hist_do_notnull(aubio_hist_t *s, fvec_t * input);
 /** compute the mean of the histogram */
-smpl_t aubio_hist_mean(aubio_hist_t *s); 
+smpl_t aubio_hist_mean(aubio_hist_t *s);
 /** weight the histogram */
-void aubio_hist_weight(aubio_hist_t *s); 
+void aubio_hist_weight(aubio_hist_t *s);
 /** compute dynamic histogram for non-null elements */
 void aubio_hist_dyn_notnull (aubio_hist_t *s, fvec_t *input);