src/: sync header defines, remove trailing spaces, update copyrights

Signed-off-by: Paul Brossier <piem@piem.org>

diff --git a/src/aubio_priv.h b/src/aubio_priv.h
index ccc1955..2fb7792 100644 (file)
--- a/src/aubio_priv.h
+++ b/src/aubio_priv.h
@@ -24,8 +24,8 @@
  * This file is for inclusion from _within_ the library only.
  */
 
-#ifndef _AUBIO_PRIV_H
-#define _AUBIO_PRIV_H
+#ifndef _AUBIO__PRIV_H
+#define _AUBIO__PRIV_H
 
 /*********************
  *
@@ -217,4 +217,4 @@ typedef enum {
 
 #define UNUSED __attribute__((unused))
 
-#endif/*_AUBIO_PRIV_H*/
+#endif /* _AUBIO__PRIV_H */

diff --git a/src/cvec.h b/src/cvec.h
index 7968ce6..8cff648 100644 (file)
--- a/src/cvec.h
+++ b/src/cvec.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -18,8 +18,8 @@
 
 */
 
-#ifndef _CVEC_H
-#define _CVEC_H
+#ifndef _AUBIO__CVEC_H
+#define _AUBIO__CVEC_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -221,5 +221,4 @@ void cvec_zeros(cvec_t *s);
 }
 #endif
 
-#endif /* _CVEC_H */
-
+#endif /* _AUBIO__CVEC_H */

diff --git a/src/fmat.h b/src/fmat.h
index b83c4c9..277ca54 100644 (file)
--- a/src/fmat.h
+++ b/src/fmat.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2009-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -18,8 +18,8 @@
 
 */
 
-#ifndef _FMAT_H
-#define _FMAT_H
+#ifndef _AUBIO__FMAT_H
+#define _AUBIO__FMAT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -175,4 +175,4 @@ void fmat_copy(fmat_t *s, fmat_t *t);
 }
 #endif
 
-#endif /* _FMAT_H */
+#endif /* _AUBIO__FMAT_H */

diff --git a/src/fvec.h b/src/fvec.h
index b00a651..7c539d6 100644 (file)
--- a/src/fvec.h
+++ b/src/fvec.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -18,8 +18,8 @@
 
 */
 
-#ifndef _FVEC_H
-#define _FVEC_H
+#ifndef _AUBIO__FVEC_H
+#define _AUBIO__FVEC_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -175,4 +175,4 @@ void fvec_copy(fvec_t *s, fvec_t *t);
 }
 #endif
 
-#endif /* _FVEC_H */
+#endif /* _AUBIO__FVEC_H */

diff --git a/src/lvec.h b/src/lvec.h
index 5bf0bce..80d4aa6 100644 (file)
--- a/src/lvec.h
+++ b/src/lvec.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -18,8 +18,8 @@
 
 */
 
-#ifndef _LVEC_H
-#define _LVEC_H
+#ifndef _AUBIO__LVEC_H
+#define _AUBIO__LVEC_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -125,4 +125,4 @@ void lvec_ones(lvec_t *s);
 }
 #endif
 
-#endif /* _LVEC_H */
+#endif /* _AUBIO__LVEC_H */

diff --git a/src/mathutils.h b/src/mathutils.h
index d9b6042..d4905a7 100644 (file)
--- a/src/mathutils.h
+++ b/src/mathutils.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -27,8 +27,8 @@
 
  */
 
-#ifndef MATHUTILS_H
-#define MATHUTILS_H
+#ifndef _AUBIO_MATHUTILS_H
+#define _AUBIO_MATHUTILS_H
 
 #include "fvec.h"
 #include "musicutils.h"
@@ -282,5 +282,4 @@ void aubio_autocorr (fvec_t * input, fvec_t * output);
 }
 #endif
 
-#endif
-
+#endif /* _AUBIO_MATHUTILS_H */

diff --git a/src/musicutils.h b/src/musicutils.h
index 4c823fd..04e71df 100644 (file)
--- a/src/musicutils.h
+++ b/src/musicutils.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -22,8 +22,8 @@
  *  various functions useful in audio signal processing
  */
 
-#ifndef MUSICUTILS_H
-#define MUSICUTILS_H
+#ifndef _AUBIO__MUSICUTILS_H
+#define _AUBIO__MUSICUTILS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -148,5 +148,4 @@ smpl_t aubio_level_detection (fvec_t * v, smpl_t threshold);
 }
 #endif
 
-#endif
-
+#endif /* _AUBIO__MUSICUTILS_H */

diff --git a/src/onset/onset.h b/src/onset/onset.h
index e0a5858..b66a038 100644 (file)
--- a/src/onset/onset.h
+++ b/src/onset/onset.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2006-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2006-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -39,8 +39,8 @@
 */
 
 
-#ifndef ONSET_H
-#define ONSET_H
+#ifndef _AUBIO_ONSET_H
+#define _AUBIO_ONSET_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -268,4 +268,4 @@ void del_aubio_onset(aubio_onset_t * o);
 }
 #endif
 
-#endif /* ONSET_H */
+#endif /* _AUBIO_ONSET_H */

diff --git a/src/onset/peakpicker.h b/src/onset/peakpicker.h
index 63b3b9b..ece5404 100644 (file)
--- a/src/onset/peakpicker.h
+++ b/src/onset/peakpicker.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -26,8 +26,8 @@
   
 */
 
-#ifndef PEAKPICK_H
-#define PEAKPICK_H
+#ifndef _AUBIO_PEAKPICK_H
+#define _AUBIO_PEAKPICK_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -54,4 +54,4 @@ smpl_t aubio_peakpicker_get_threshold(aubio_peakpicker_t * p);
 }
 #endif
 
-#endif /* PEAKPICK_H */
+#endif /* _AUBIO_PEAKPICK_H */

diff --git a/src/pitch/pitch.h b/src/pitch/pitch.h
index 622f8e3..75ff399 100644 (file)
--- a/src/pitch/pitch.h
+++ b/src/pitch/pitch.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -18,8 +18,8 @@
 
 */
 
-#ifndef PITCH_H
-#define PITCH_H
+#ifndef _AUBIO_PITCH_H
+#define _AUBIO_PITCH_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -179,4 +179,4 @@ smpl_t aubio_pitch_get_confidence (aubio_pitch_t * o);
 }
 #endif
 
-#endif /*PITCH_H*/
+#endif /* _AUBIO_PITCH_H */

diff --git a/src/pitch/pitchfcomb.h b/src/pitch/pitchfcomb.h
index 471208f..9203cc1 100644 (file)
--- a/src/pitch/pitchfcomb.h
+++ b/src/pitch/pitchfcomb.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -34,8 +34,8 @@
 
 */
 
-#ifndef _PITCHFCOMB_H
-#define _PITCHFCOMB_H
+#ifndef _AUBIO_PITCHFCOMB_H
+#define _AUBIO_PITCHFCOMB_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -73,6 +73,4 @@ void del_aubio_pitchfcomb (aubio_pitchfcomb_t * p);
 }
 #endif
 
-#endif /* _PITCHFCOMB_H */
-
-
+#endif /* _AUBIO_PITCHFCOMB_H */

diff --git a/src/pitch/pitchmcomb.h b/src/pitch/pitchmcomb.h
index 48809aa..15c6c0d 100644 (file)
--- a/src/pitch/pitchmcomb.h
+++ b/src/pitch/pitchmcomb.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -35,8 +35,8 @@
 
 */
 
-#ifndef PITCHMCOMB_H
-#define PITCHMCOMB_H
+#ifndef _AUBIO_PITCHMCOMB_H
+#define _AUBIO_PITCHMCOMB_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -74,4 +74,4 @@ void del_aubio_pitchmcomb (aubio_pitchmcomb_t * p);
 }
 #endif
 
-#endif /* PITCHMCOMB_H */
+#endif /* _AUBIO_PITCHMCOMB_H */

diff --git a/src/pitch/pitchschmitt.h b/src/pitch/pitchschmitt.h
index 5a9ee56..6052bad 100644 (file)
--- a/src/pitch/pitchschmitt.h
+++ b/src/pitch/pitchschmitt.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -34,8 +34,8 @@
 
 */
 
-#ifndef _PITCHSCHMITT_H
-#define _PITCHSCHMITT_H
+#ifndef _AUBIO_PITCHSCHMITT_H
+#define _AUBIO_PITCHSCHMITT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -72,5 +72,5 @@ void del_aubio_pitchschmitt (aubio_pitchschmitt_t * p);
 }
 #endif
 
-#endif /* _PITCHSCHMITT_H */
+#endif /* _AUBIO_PITCHSCHMITT_H */
 

diff --git a/src/pitch/pitchspecacf.h b/src/pitch/pitchspecacf.h
index 06b5b62..5d3d1b0 100644 (file)
--- a/src/pitch/pitchspecacf.h
+++ b/src/pitch/pitchspecacf.h
@@ -38,8 +38,8 @@
 
 */
 
-#ifndef AUBIO_PITCHSPECACF_H
-#define AUBIO_PITCHSPECACF_H
+#ifndef _AUBIO_PITCHSPECACF_H
+#define _AUBIO_PITCHSPECACF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -100,4 +100,4 @@ smpl_t aubio_pitchspecacf_get_confidence (aubio_pitchspecacf_t * o);
 }
 #endif
 
-#endif /*AUBIO_PITCHSPECACF_H*/
+#endif /* _AUBIO_PITCHSPECACF_H */

diff --git a/src/pitch/pitchyin.h b/src/pitch/pitchyin.h
index c6f2e1f..ad6b5a8 100644 (file)
--- a/src/pitch/pitchyin.h
+++ b/src/pitch/pitchyin.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -34,8 +34,8 @@
 
 */
 
-#ifndef PITCHYIN_H
-#define PITCHYIN_H
+#ifndef _AUBIO_PITCHYIN_H
+#define _AUBIO_PITCHYIN_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -96,4 +96,4 @@ smpl_t aubio_pitchyin_get_confidence (aubio_pitchyin_t * o);
 }
 #endif
 
-#endif /*PITCHYIN_H*/
+#endif /* _AUBIO_PITCHYIN_H */

diff --git a/src/pitch/pitchyinfft.h b/src/pitch/pitchyinfft.h
index 4bd0713..ee89d0f 100644 (file)
--- a/src/pitch/pitchyinfft.h
+++ b/src/pitch/pitchyinfft.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -35,8 +35,8 @@
 
 */
 
-#ifndef PITCHYINFFT_H
-#define PITCHYINFFT_H
+#ifndef _AUBIO_PITCHYINFFT_H
+#define _AUBIO_PITCHYINFFT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -96,4 +96,4 @@ smpl_t aubio_pitchyinfft_get_confidence (aubio_pitchyinfft_t * o);
 }
 #endif
 
-#endif /*PITCHYINFFT_H*/ 
+#endif /* _AUBIO_PITCHYINFFT_H */

diff --git a/src/spectral/fft.h b/src/spectral/fft.h
index 1c00037..7cc72d7 100644 (file)
--- a/src/spectral/fft.h
+++ b/src/spectral/fft.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -26,8 +26,8 @@
 
 */
 
-#ifndef FFT_H_
-#define FFT_H_
+#ifndef _AUBIO_FFT_H
+#define _AUBIO_FFT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -139,4 +139,4 @@ void aubio_fft_get_real(cvec_t * spectrum, fvec_t * compspec);
 }
 #endif
 
-#endif // FFT_H_
+#endif /* _AUBIO_FFT_H */

diff --git a/src/spectral/filterbank.h b/src/spectral/filterbank.h
index d43fd08..80c6982 100644 (file)
--- a/src/spectral/filterbank.h
+++ b/src/spectral/filterbank.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2007-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2007-2013 Paul Brossier <piem@aubio.org>
                       and Amaury Hazan <ahazan@iua.upf.edu>
 
   This file is part of aubio.
@@ -29,8 +29,8 @@
 
 */
 
-#ifndef FILTERBANK_H
-#define FILTERBANK_H
+#ifndef _AUBIO_FILTERBANK_H
+#define _AUBIO_FILTERBANK_H
 
 #ifdef __cplusplus
 extern "C"
@@ -87,4 +87,4 @@ uint_t aubio_filterbank_set_coeffs (aubio_filterbank_t * f, fmat_t * filters);
 }
 #endif
 
-#endif                          // FILTERBANK_H
+#endif /* _AUBIO_FILTERBANK_H */

diff --git a/src/spectral/filterbank_mel.h b/src/spectral/filterbank_mel.h
index d2e8876..0d4a51f 100644 (file)
--- a/src/spectral/filterbank_mel.h
+++ b/src/spectral/filterbank_mel.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2007-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2007-2013 Paul Brossier <piem@aubio.org>
                       and Amaury Hazan <ahazan@iua.upf.edu>
 
   This file is part of aubio.
@@ -31,8 +31,8 @@
 
 */
 
-#ifndef FILTERBANK_MEL_H
-#define FILTERBANK_MEL_H
+#ifndef _AUBIO_FILTERBANK_MEL_H
+#define _AUBIO_FILTERBANK_MEL_H
 
 #ifdef __cplusplus
 extern "C"
@@ -69,4 +69,4 @@ uint_t aubio_filterbank_set_mel_coeffs_slaney (aubio_filterbank_t * fb,
 }
 #endif
 
-#endif // FILTERBANK_MEL_H
+#endif /* _AUBIO_FILTERBANK_MEL_H */

diff --git a/src/spectral/mfcc.h b/src/spectral/mfcc.h
index b6befa1..6527d44 100644 (file)
--- a/src/spectral/mfcc.h
+++ b/src/spectral/mfcc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2007-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2007-2013 Paul Brossier <piem@aubio.org>
                       and Amaury Hazan <ahazan@iua.upf.edu>
 
   This file is part of aubio.
@@ -27,8 +27,8 @@
 
 */
 
-#ifndef MFCC_H
-#define MFCC_H
+#ifndef _AUBIO_MFCC_H
+#define _AUBIO_MFCC_H
 
 #ifdef __cplusplus
 extern "C"
@@ -69,4 +69,4 @@ void aubio_mfcc_do (aubio_mfcc_t * mf, cvec_t * in, fvec_t * out);
 }
 #endif
 
-#endif                          // MFCC_H
+#endif /* _AUBIO_MFCC_H */

diff --git a/src/spectral/phasevoc.h b/src/spectral/phasevoc.h
index cd4f739..9b1a3b5 100644 (file)
--- a/src/spectral/phasevoc.h
+++ b/src/spectral/phasevoc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -31,8 +31,8 @@
 
 */
 
-#ifndef _PHASEVOC_H
-#define _PHASEVOC_H
+#ifndef _AUBIO_PHASEVOC_H
+#define _AUBIO_PHASEVOC_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -99,4 +99,4 @@ uint_t aubio_pvoc_get_hop(aubio_pvoc_t* pv);
 }
 #endif 
 
-#endif
+#endif /* _AUBIO_PHASEVOC_H */

diff --git a/src/spectral/specdesc.h b/src/spectral/specdesc.h
index 814f190..cf1ea6e 100644 (file)
--- a/src/spectral/specdesc.h
+++ b/src/spectral/specdesc.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -19,13 +19,13 @@
 */
 
 /** \file
- 
+
   Spectral description functions
- 
+
   All of the following spectral description functions take as arguments the FFT
   of a windowed signal (as created with aubio_pvoc). They output one smpl_t per
   buffer (stored in a vector of size [1]).
- 
+
   \section specdesc Spectral description functions
 
   A list of the spectral description methods currently available follows.
@@ -34,54 +34,54 @@
 
   These functions are designed to raise at notes attacks in music signals.
 
-  \b \p energy : Energy based onset detection function 
- 
+  \b \p energy : Energy based onset detection function
+
   This function calculates the local energy of the input spectral frame.
-  
+
   \b \p hfc : High Frequency Content onset detection function
- 
+
   This method computes the High Frequency Content (HFC) of the input spectral
   frame. The resulting function is efficient at detecting percussive onsets.
 
   Paul Masri. Computer modeling of Sound for Transformation and Synthesis of
   Musical Signal. PhD dissertation, University of Bristol, UK, 1996.
 
-  \b \p complex : Complex Domain Method onset detection function 
- 
+  \b \p complex : Complex Domain Method onset detection function
+
   Christopher Duxbury, Mike E. Davies, and Mark B. Sandler. Complex domain
   onset detection for musical signals. In Proceedings of the Digital Audio
   Effects Conference, DAFx-03, pages 90-93, London, UK, 2003.
 
-  \b \p phase : Phase Based Method onset detection function 
+  \b \p phase : Phase Based Method onset detection function
 
   Juan-Pablo Bello, Mike P. Davies, and Mark B. Sandler. Phase-based note onset
   detection for music signals. In Proceedings of the IEEE International
   Conference on Acoustics Speech and Signal Processing, pages 441­444,
   Hong-Kong, 2003.
 
-  \b \p specdiff : Spectral difference method onset detection function 
+  \b \p specdiff : Spectral difference method onset detection function
 
   Jonhatan Foote and Shingo Uchihashi. The beat spectrum: a new approach to
   rhythm analysis. In IEEE International Conference on Multimedia and Expo
   (ICME 2001), pages 881­884, Tokyo, Japan, August 2001.
 
-  \b \p kl : Kullback-Liebler onset detection function 
-  
+  \b \p kl : Kullback-Liebler onset detection function
+
   Stephen Hainsworth and Malcom Macleod. Onset detection in music audio
   signals. In Proceedings of the International Computer Music Conference
   (ICMC), Singapore, 2003.
 
-  \b \p mkl : Modified Kullback-Liebler onset detection function 
+  \b \p mkl : Modified Kullback-Liebler onset detection function
 
   Paul Brossier, ``Automatic annotation of musical audio for interactive
   systems'', Chapter 2, Temporal segmentation, PhD thesis, Centre for Digital
   music, Queen Mary University of London, London, UK, 2006.
 
-  \b \p specflux : Spectral Flux 
+  \b \p specflux : Spectral Flux
 
   Simon Dixon, Onset Detection Revisited, in ``Proceedings of the 9th
   International Conference on Digital Audio Effects'' (DAFx-06), Montreal,
-  Canada, 2006. 
+  Canada, 2006.
 
   \subsection shapedesc Spectral shape descriptors
 
@@ -92,14 +92,14 @@
   Project Report 2004 (<a
   href="http://www.ircam.fr/anasyn/peeters/ARTICLES/Peeters_2003_cuidadoaudiofeatures.pdf">pdf</a>)
 
-  \b \p centroid : Spectral centroid 
+  \b \p centroid : Spectral centroid
 
   The spectral centroid represents the barycenter of the spectrum.
 
   \e Note: This function returns the result in bin. To get the spectral
-  centroid in Hz, aubio_bintofreq() should be used. 
+  centroid in Hz, aubio_bintofreq() should be used.
 
-  \b \p spread : Spectral spread 
+  \b \p spread : Spectral spread
 
   The spectral spread is the variance of the spectral distribution around its
   centroid.
@@ -125,14 +125,14 @@
   See also <a href="http://en.wikipedia.org/wiki/Kurtosis">Kurtosis</a> on
   Wikipedia.
 
-  \b \p slope : Spectral slope 
+  \b \p slope : Spectral slope
 
   The spectral slope represents decreasing rate of the spectral amplitude,
   computed using a linear regression.
 
   \b \p decrease : Spectral decrease
 
-  The spectral decrease is another representation of the decreasing rate,  
+  The spectral decrease is another representation of the decreasing rate,
   based on perceptual criteria.
 
   \b \p rolloff : Spectral roll-off
@@ -145,8 +145,8 @@
 */
 
 
-#ifndef ONSETDETECTION_H
-#define ONSETDETECTION_H
+#ifndef _AUBIO_SPECDESC_H
+#define _AUBIO_SPECDESC_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -155,10 +155,10 @@ extern "C" {
 /** spectral description structure */
 typedef struct _aubio_specdesc_t aubio_specdesc_t;
 
-/** execute spectral description function on a spectral frame 
+/** execute spectral description function on a spectral frame
 
   Generic function to compute spectral detescription.
- 
+
   \param o spectral description object as returned by new_aubio_specdesc()
   \param fftgrain input signal spectrum as computed by aubio_pvoc_do
   \param desc output vector (one sample long, to send to the peak picking)
@@ -167,7 +167,7 @@ typedef struct _aubio_specdesc_t aubio_specdesc_t;
 void aubio_specdesc_do (aubio_specdesc_t * o, cvec_t * fftgrain,
     fvec_t * desc);
 
-/** creation of a spectral description object 
+/** creation of a spectral description object
 
   \param method spectral description method
   \param buf_size length of the input spectrum frame
@@ -180,7 +180,7 @@ void aubio_specdesc_do (aubio_specdesc_t * o, cvec_t * fftgrain,
 */
 aubio_specdesc_t *new_aubio_specdesc (char_t * method, uint_t buf_size);
 
-/** deletion of a spectral descriptor 
+/** deletion of a spectral descriptor
 
   \param o spectral descriptor object as returned by new_aubio_specdesc()
 
@@ -191,4 +191,4 @@ void del_aubio_specdesc (aubio_specdesc_t * o);
 }
 #endif
 
-#endif /* ONSETDETECTION_H */
+#endif /* _AUBIO_SPECDESC_H */

diff --git a/src/spectral/tss.h b/src/spectral/tss.h
index e6c0fc9..610e7d6 100644 (file)
--- a/src/spectral/tss.h
+++ b/src/spectral/tss.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -36,8 +36,8 @@
 
 */
 
-#ifndef TSS_H
-#define TSS_H
+#ifndef _AUBIO_TSS_H
+#define _AUBIO_TSS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -100,4 +100,4 @@ uint_t aubio_tss_set_beta (aubio_tss_t * o, smpl_t beta);
 }
 #endif
 
-#endif /*TSS_H*/
+#endif /* _AUBIO_TSS_H */

diff --git a/src/synth/sampler.h b/src/synth/sampler.h
index cd9f374..b27a8df 100644 (file)
--- a/src/synth/sampler.h
+++ b/src/synth/sampler.h
@@ -18,8 +18,8 @@
 
 */
 
-#ifndef _AUBIO_SYNTH_SAMPLER_H
-#define _AUBIO_SYNTH_SAMPLER_H
+#ifndef _AUBIO_SAMPLER_H
+#define _AUBIO_SAMPLER_H
 
 /** \file
 
@@ -137,4 +137,4 @@ void del_aubio_sampler( aubio_sampler_t * o );
 }
 #endif
 
-#endif /* _AUBIO_SYNTH_SAMPLER_H */
+#endif /* _AUBIO_SAMPLER_H */

diff --git a/src/synth/wavetable.h b/src/synth/wavetable.h
index 5543cd7..a719ad9 100644 (file)
--- a/src/synth/wavetable.h
+++ b/src/synth/wavetable.h
@@ -18,8 +18,8 @@
 
 */
 
-#ifndef _AUBIO_SYNTH_WAVETABLE_H
-#define _AUBIO_SYNTH_WAVETABLE_H
+#ifndef _AUBIO_WAVETABLE_H
+#define _AUBIO_WAVETABLE_H
 
 /** \file
 
@@ -175,4 +175,4 @@ void del_aubio_wavetable( aubio_wavetable_t * o );
 }
 #endif
 
-#endif /* _AUBIO_SYNTH_WAVETABLE_H */
+#endif /* _AUBIO_WAVETABLE_H */

diff --git a/src/tempo/beattracking.h b/src/tempo/beattracking.h
index 06d4196..80470e9 100644 (file)
--- a/src/tempo/beattracking.h
+++ b/src/tempo/beattracking.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Matthew Davies and Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Matthew Davies and Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -36,8 +36,8 @@
   \example tempo/test-beattracking.c
   
 */
-#ifndef BEATTRACKING_H
-#define BEATTRACKING_H
+#ifndef _AUBIO_BEATTRACKING_H
+#define _AUBIO_BEATTRACKING_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -98,4 +98,4 @@ void del_aubio_beattracking(aubio_beattracking_t * p);
 }
 #endif
 
-#endif /* BEATTRACKING_H */
+#endif /* _AUBIO_BEATTRACKING_H */

diff --git a/src/tempo/tempo.h b/src/tempo/tempo.h
index 9e4378b..b4742e7 100644 (file)
--- a/src/tempo/tempo.h
+++ b/src/tempo/tempo.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2006-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2006-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -30,8 +30,8 @@
 
 */
 
-#ifndef TEMPO_H
-#define TEMPO_H
+#ifndef _AUBIO_TEMPO_H
+#define _AUBIO_TEMPO_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -133,4 +133,4 @@ void del_aubio_tempo(aubio_tempo_t * o);
 }
 #endif
 
-#endif /* TEMPO_H */
+#endif /* _AUBIO_TEMPO_H */

diff --git a/src/temporal/a_weighting.h b/src/temporal/a_weighting.h
index e5f743d..1a423c0 100644 (file)
--- a/src/temporal/a_weighting.h
+++ b/src/temporal/a_weighting.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -18,8 +18,8 @@
 
 */
 
-#ifndef _ADESIGN_H
-#define _ADESIGN_H
+#ifndef _AUBIO_FILTER_A_DESIGN_H
+#define _AUBIO_FILTER_A_DESIGN_H
 
 /** \file
 
@@ -85,4 +85,4 @@ uint_t aubio_filter_set_a_weighting (aubio_filter_t * f, uint_t samplerate);
 }
 #endif
 
-#endif /* _ADESIGN_H */
+#endif /* _AUBIO_FILTER_A_DESIGN_H */

diff --git a/src/temporal/biquad.h b/src/temporal/biquad.h
index 42cb36f..c5305c3 100644 (file)
--- a/src/temporal/biquad.h
+++ b/src/temporal/biquad.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -18,8 +18,8 @@
 
 */
 
-#ifndef BIQUAD_H
-#define BIQUAD_H
+#ifndef _AUBIO_FILTER_BIQUAD_H
+#define _AUBIO_FILTER_BIQUAD_H
 
 /** \file 
 
@@ -72,4 +72,4 @@ aubio_filter_t *new_aubio_filter_biquad (lsmp_t b0, lsmp_t b1, lsmp_t b2,
 }
 #endif
 
-#endif /*BIQUAD_H*/
+#endif /* _AUBIO_FILTER_BIQUAD_H */

diff --git a/src/temporal/c_weighting.h b/src/temporal/c_weighting.h
index 5e33b6c..3290be8 100644 (file)
--- a/src/temporal/c_weighting.h
+++ b/src/temporal/c_weighting.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -18,8 +18,8 @@
 
 */
 
-#ifndef _CDESIGN_H
-#define _CDESIGN_H
+#ifndef _AUBIO_FILTER_C_DESIGN_H
+#define _AUBIO_FILTER_C_DESIGN_H
 
 /** \file
 
@@ -85,4 +85,4 @@ uint_t aubio_filter_set_c_weighting (aubio_filter_t * f, uint_t samplerate);
 }
 #endif
 
-#endif /* _CDESIGN_H */
+#endif /* _AUBIO_FILTER_C_DESIGN_H */

diff --git a/src/temporal/filter.h b/src/temporal/filter.h
index 83d2e78..1fa3896 100644 (file)
--- a/src/temporal/filter.h
+++ b/src/temporal/filter.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -18,8 +18,8 @@
 
 */
 
-#ifndef FILTER_H
-#define FILTER_H
+#ifndef _AUBIO_FILTER_H
+#define _AUBIO_FILTER_H
 
 /** \file 
 
@@ -173,4 +173,4 @@ void del_aubio_filter (aubio_filter_t * f);
 }
 #endif
 
-#endif /*FILTER_H*/
+#endif /* _AUBIO_FILTER_H */

diff --git a/src/temporal/resampler.h b/src/temporal/resampler.h
index 5111852..2c23359 100644 (file)
--- a/src/temporal/resampler.h
+++ b/src/temporal/resampler.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -18,8 +18,8 @@
 
 */
 
-#ifndef _RESAMPLE_H
-#define _RESAMPLE_H
+#ifndef _AUBIO_RESAMPLER_H
+#define _AUBIO_RESAMPLER_H
 
 /** \file
  
@@ -62,4 +62,4 @@ void aubio_resampler_do (aubio_resampler_t * s, fvec_t * input,
 }
 #endif
 
-#endif /* _RESAMPLE_H */
+#endif /* _AUBIO_RESAMPLER_H */

diff --git a/src/types.h b/src/types.h
index 37733b6..9a4c56c 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -18,8 +18,8 @@
 
 */
 
-#ifndef AUBIO_TYPES_H
-#define AUBIO_TYPES_H
+#ifndef _AUBIO__TYPES_H
+#define _AUBIO__TYPES_H
 
 /** \file
  
@@ -67,4 +67,4 @@ typedef char         char_t;
 }
 #endif
 
-#endif/*AUBIO_TYPES_H*/
+#endif /* _AUBIO__TYPES_H */

diff --git a/src/utils/hist.h b/src/utils/hist.h
index b59fba1..a6bcd75 100644 (file)
--- a/src/utils/hist.h
+++ b/src/utils/hist.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -25,8 +25,8 @@
  * Big hacks to implement an histogram
  */
 
-#ifndef HIST_H
-#define HIST_H
+#ifndef _AUBIO_HIST_H
+#define _AUBIO_HIST_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -60,4 +60,4 @@ void aubio_hist_dyn_notnull (aubio_hist_t *s, fvec_t *input);
 }
 #endif
 
-#endif
+#endif /* _AUBIO_HIST_H */

diff --git a/src/utils/parameter.h b/src/utils/parameter.h
index 51c2cda..3b7e144 100644 (file)
--- a/src/utils/parameter.h
+++ b/src/utils/parameter.h
@@ -157,4 +157,3 @@ void del_aubio_parameter( aubio_parameter_t * param );
 #endif
 
 #endif /* _AUBIO_PARAMETER_H */
-

diff --git a/src/utils/scale.h b/src/utils/scale.h
index bf9ad5e..b52b610 100644 (file)
--- a/src/utils/scale.h
+++ b/src/utils/scale.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -28,8 +28,8 @@
  \f$ y = (x - ilow)*(ohig-olow)/(ihig-ilow) + olow \f$ 
  
 */
-#ifndef SCALE_H
-#define SCALE_H
+#ifndef _AUBIO_SCALE_H
+#define _AUBIO_SCALE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -77,4 +77,4 @@ uint_t aubio_scale_set_limits (aubio_scale_t *s, smpl_t ilow, smpl_t ihig,
 }
 #endif 
 
-#endif
+#endif /* _AUBIO_SCALE_H */

diff --git a/src/vecutils.h b/src/vecutils.h
index 9bbdb48..a6e8ab3 100644 (file)
--- a/src/vecutils.h
+++ b/src/vecutils.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2009-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -24,8 +24,8 @@
 
  */
 
-#ifndef _VECUTILS_H
-#define _VECUTILS_H
+#ifndef _AUBIO__VECUTILS_H
+#define _AUBIO__VECUTILS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -191,4 +191,4 @@ void cvec_pow (cvec_t *s, smpl_t pow);
 }
 #endif
 
-#endif /*_VECUTILS_H*/
+#endif /* _AUBIO__VECUTILS_H */