Changeset b235c0e

Timestamp:

Dec 11, 2013, 1:04:27 AM (11 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

c7ec2c6

Parents:

3194dca1

Message:

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

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

Location:

src

Files:

• aubio_priv.h (modified) (2 diffs)
• cvec.h (modified) (3 diffs)
• fmat.h (modified) (3 diffs)
• fvec.h (modified) (3 diffs)
• lvec.h (modified) (3 diffs)
• mathutils.h (modified) (3 diffs)
• musicutils.h (modified) (3 diffs)
• onset/onset.h (modified) (3 diffs)
• onset/peakpicker.h (modified) (3 diffs)
• pitch/pitch.h (modified) (3 diffs)
• pitch/pitchfcomb.h (modified) (3 diffs)
• pitch/pitchmcomb.h (modified) (3 diffs)
• pitch/pitchschmitt.h (modified) (3 diffs)
• pitch/pitchspecacf.h (modified) (2 diffs)
• pitch/pitchyin.h (modified) (3 diffs)
• pitch/pitchyinfft.h (modified) (3 diffs)
• spectral/fft.h (modified) (3 diffs)
• spectral/filterbank.h (modified) (3 diffs)
• spectral/filterbank_mel.h (modified) (3 diffs)
• spectral/mfcc.h (modified) (3 diffs)
• spectral/phasevoc.h (modified) (3 diffs)
• spectral/specdesc.h (modified) (15 diffs)
• spectral/tss.h (modified) (3 diffs)
• synth/sampler.h (modified) (2 diffs)
• synth/wavetable.h (modified) (2 diffs)
• tempo/beattracking.h (modified) (3 diffs)
• tempo/tempo.h (modified) (3 diffs)
• temporal/a_weighting.h (modified) (3 diffs)
• temporal/biquad.h (modified) (3 diffs)
• temporal/c_weighting.h (modified) (3 diffs)
• temporal/filter.h (modified) (3 diffs)
• temporal/resampler.h (modified) (3 diffs)
• types.h (modified) (3 diffs)
• utils/hist.h (modified) (3 diffs)
• utils/parameter.h (modified) (1 diff)
• utils/scale.h (modified) (3 diffs)
• vecutils.h (modified) (3 diffs)

src/aubio_priv.h

@@ -25 +25 @@
  */
 
-#ifndef _AUBIO_PRIV_H
-#define _AUBIO_PRIV_H
+#ifndef _AUBIO__PRIV_H
+#define _AUBIO__PRIV_H
 
 /*********************
@@ -218 +218 @@
 #define UNUSED __attribute__((unused))
 
-#endif/*_AUBIO_PRIV_H*/
+#endif /* _AUBIO__PRIV_H */

src/cvec.h

@@ -1 +1 @@
 /*
-  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 +19 @@
 */
 
-#ifndef _CVEC_H
-#define _CVEC_H
+#ifndef _AUBIO__CVEC_H
+#define _AUBIO__CVEC_H
 
 #ifdef __cplusplus
@@ -222 +222 @@
 #endif
 
-#endif /* _CVEC_H */
-
+#endif /* _AUBIO__CVEC_H */

src/fmat.h

@@ -1 +1 @@
 /*
-  Copyright (C) 2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2009-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
@@ -19 +19 @@
 */
 
-#ifndef _FMAT_H
-#define _FMAT_H
+#ifndef _AUBIO__FMAT_H
+#define _AUBIO__FMAT_H
 
 #ifdef __cplusplus
@@ -176 +176 @@
 #endif
 
-#endif /* _FMAT_H */
+#endif /* _AUBIO__FMAT_H */

src/fvec.h

@@ -1 +1 @@
 /*
-  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 +19 @@
 */
 
-#ifndef _FVEC_H
-#define _FVEC_H
+#ifndef _AUBIO__FVEC_H
+#define _AUBIO__FVEC_H
 
 #ifdef __cplusplus
@@ -176 +176 @@
 #endif
 
-#endif /* _FVEC_H */
+#endif /* _AUBIO__FVEC_H */

src/lvec.h

@@ -1 +1 @@
 /*
-  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 +19 @@
 */
 
-#ifndef _LVEC_H
-#define _LVEC_H
+#ifndef _AUBIO__LVEC_H
+#define _AUBIO__LVEC_H
 
 #ifdef __cplusplus
@@ -126 +126 @@
 #endif
 
-#endif /* _LVEC_H */
+#endif /* _AUBIO__LVEC_H */

src/mathutils.h

@@ -1 +1 @@
 /*
-  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 +28 @@
  */
 
-#ifndef MATHUTILS_H
-#define MATHUTILS_H
+#ifndef _AUBIO_MATHUTILS_H
+#define _AUBIO_MATHUTILS_H
 
 #include "fvec.h"
@@ -283 +283 @@
 #endif
 
-#endif
-
+#endif /* _AUBIO_MATHUTILS_H */

src/musicutils.h

@@ -1 +1 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
@@ -23 +23 @@
  */
 
-#ifndef MUSICUTILS_H
-#define MUSICUTILS_H
+#ifndef _AUBIO__MUSICUTILS_H
+#define _AUBIO__MUSICUTILS_H
 
 #ifdef __cplusplus
@@ -149 +149 @@
 #endif
 
-#endif
-
+#endif /* _AUBIO__MUSICUTILS_H */

src/onset/onset.h

@@ -1 +1 @@
 /*
-  Copyright (C) 2006-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2006-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
@@ -40 +40 @@
 
 
-#ifndef ONSET_H
-#define ONSET_H
+#ifndef _AUBIO_ONSET_H
+#define _AUBIO_ONSET_H
 
 #ifdef __cplusplus
@@ -269 +269 @@
 #endif
 
-#endif /* ONSET_H */
+#endif /* _AUBIO_ONSET_H */

src/onset/peakpicker.h

@@ -1 +1 @@
 /*
-  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 +27 @@
 */
 
-#ifndef PEAKPICK_H
-#define PEAKPICK_H
+#ifndef _AUBIO_PEAKPICK_H
+#define _AUBIO_PEAKPICK_H
 
 #ifdef __cplusplus
@@ -55 +55 @@
 #endif
 
-#endif /* PEAKPICK_H */
+#endif /* _AUBIO_PEAKPICK_H */

src/pitch/pitch.h

@@ -1 +1 @@
 /*
-  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 +19 @@
 */
 
-#ifndef PITCH_H
-#define PITCH_H
+#ifndef _AUBIO_PITCH_H
+#define _AUBIO_PITCH_H
 
 #ifdef __cplusplus
@@ -180 +180 @@
 #endif
 
-#endif /*PITCH_H*/
+#endif /* _AUBIO_PITCH_H */

src/pitch/pitchfcomb.h

@@ -1 +1 @@
 /*
-  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 +35 @@
 */
 
-#ifndef _PITCHFCOMB_H
-#define _PITCHFCOMB_H
+#ifndef _AUBIO_PITCHFCOMB_H
+#define _AUBIO_PITCHFCOMB_H
 
 #ifdef __cplusplus
@@ -74 +74 @@
 #endif
 
-#endif /* _PITCHFCOMB_H */
-
-
+#endif /* _AUBIO_PITCHFCOMB_H */

src/pitch/pitchmcomb.h

@@ -1 +1 @@
 /*
-  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 +36 @@
 */
 
-#ifndef PITCHMCOMB_H
-#define PITCHMCOMB_H
+#ifndef _AUBIO_PITCHMCOMB_H
+#define _AUBIO_PITCHMCOMB_H
 
 #ifdef __cplusplus
@@ -75 +75 @@
 #endif
 
-#endif /* PITCHMCOMB_H */
+#endif /* _AUBIO_PITCHMCOMB_H */

src/pitch/pitchschmitt.h

@@ -1 +1 @@
 /*
-  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 +35 @@
 */
 
-#ifndef _PITCHSCHMITT_H
-#define _PITCHSCHMITT_H
+#ifndef _AUBIO_PITCHSCHMITT_H
+#define _AUBIO_PITCHSCHMITT_H
 
 #ifdef __cplusplus
@@ -73 +73 @@
 #endif
 
-#endif /* _PITCHSCHMITT_H */
+#endif /* _AUBIO_PITCHSCHMITT_H */
 

src/pitch/pitchspecacf.h

@@ -39 +39 @@
 */
 
-#ifndef AUBIO_PITCHSPECACF_H
-#define AUBIO_PITCHSPECACF_H
+#ifndef _AUBIO_PITCHSPECACF_H
+#define _AUBIO_PITCHSPECACF_H
 
 #ifdef __cplusplus
@@ -101 +101 @@
 #endif
 
-#endif /*AUBIO_PITCHSPECACF_H*/
+#endif /* _AUBIO_PITCHSPECACF_H */

src/pitch/pitchyin.h

@@ -1 +1 @@
 /*
-  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 +35 @@
 */
 
-#ifndef PITCHYIN_H
-#define PITCHYIN_H
+#ifndef _AUBIO_PITCHYIN_H
+#define _AUBIO_PITCHYIN_H
 
 #ifdef __cplusplus
@@ -97 +97 @@
 #endif
 
-#endif /*PITCHYIN_H*/
+#endif /* _AUBIO_PITCHYIN_H */

src/pitch/pitchyinfft.h

@@ -1 +1 @@
 /*
-  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 +36 @@
 */
 
-#ifndef PITCHYINFFT_H
-#define PITCHYINFFT_H
+#ifndef _AUBIO_PITCHYINFFT_H
+#define _AUBIO_PITCHYINFFT_H
 
 #ifdef __cplusplus
@@ -97 +97 @@
 #endif
 
-#endif /*PITCHYINFFT_H*/ 
+#endif /* _AUBIO_PITCHYINFFT_H */

src/spectral/fft.h

@@ -1 +1 @@
 /*
-  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 +27 @@
 */
 
-#ifndef FFT_H_
-#define FFT_H_
+#ifndef _AUBIO_FFT_H
+#define _AUBIO_FFT_H
 
 #ifdef __cplusplus
@@ -140 +140 @@
 #endif
 
-#endif // FFT_H_
+#endif /* _AUBIO_FFT_H */

src/spectral/filterbank.h

@@ -1 +1 @@
 /*
-  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>
 
@@ -30 +30 @@
 */
 
-#ifndef FILTERBANK_H
-#define FILTERBANK_H
+#ifndef _AUBIO_FILTERBANK_H
+#define _AUBIO_FILTERBANK_H
 
 #ifdef __cplusplus
@@ -88 +88 @@
 #endif
 
-#endif                          // FILTERBANK_H
+#endif /* _AUBIO_FILTERBANK_H */

src/spectral/filterbank_mel.h

@@ -1 +1 @@
 /*
-  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>
 
@@ -32 +32 @@
 */
 
-#ifndef FILTERBANK_MEL_H
-#define FILTERBANK_MEL_H
+#ifndef _AUBIO_FILTERBANK_MEL_H
+#define _AUBIO_FILTERBANK_MEL_H
 
 #ifdef __cplusplus
@@ -70 +70 @@
 #endif
 
-#endif // FILTERBANK_MEL_H
+#endif /* _AUBIO_FILTERBANK_MEL_H */

src/spectral/mfcc.h

@@ -1 +1 @@
 /*
-  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>
 
@@ -28 +28 @@
 */
 
-#ifndef MFCC_H
-#define MFCC_H
+#ifndef _AUBIO_MFCC_H
+#define _AUBIO_MFCC_H
 
 #ifdef __cplusplus
@@ -70 +70 @@
 #endif
 
-#endif                          // MFCC_H
+#endif /* _AUBIO_MFCC_H */

src/spectral/phasevoc.h

@@ -1 +1 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
@@ -32 +32 @@
 */
 
-#ifndef _PHASEVOC_H
-#define _PHASEVOC_H
+#ifndef _AUBIO_PHASEVOC_H
+#define _AUBIO_PHASEVOC_H
 
 #ifdef __cplusplus
@@ -100 +100 @@
 #endif 
 
-#endif
+#endif /* _AUBIO_PHASEVOC_H */

src/spectral/specdesc.h

@@ -1 +1 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
@@ -20 +20 @@
 
 /** \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
 
@@ -35 +35 @@
   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.
@@ -47 +47 @@
   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
@@ -60 +60 @@
   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
@@ -66 +66 @@
   (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
@@ -78 +78 @@
   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
@@ -93 +93 @@
   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
@@ -126 +126 @@
   Wikipedia.
 
-  \b \p slope : Spectral slope 
+  \b \p slope : Spectral slope
 
   The spectral slope represents decreasing rate of the spectral amplitude,
@@ -133 +133 @@
   \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.
 
@@ -146 +146 @@
 
 
-#ifndef ONSETDETECTION_H
-#define ONSETDETECTION_H
+#ifndef _AUBIO_SPECDESC_H
+#define _AUBIO_SPECDESC_H
 
 #ifdef __cplusplus
@@ -156 +156 @@
 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
@@ -168 +168 @@
     fvec_t * desc);
 
-/** creation of a spectral description object 
+/** creation of a spectral description object
 
   \param method spectral description method
@@ -181 +181 @@
 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()
@@ -192 +192 @@
 #endif
 
-#endif /* ONSETDETECTION_H */
+#endif /* _AUBIO_SPECDESC_H */

src/spectral/tss.h

@@ -1 +1 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
@@ -37 +37 @@
 */
 
-#ifndef TSS_H
-#define TSS_H
+#ifndef _AUBIO_TSS_H
+#define _AUBIO_TSS_H
 
 #ifdef __cplusplus
@@ -101 +101 @@
 #endif
 
-#endif /*TSS_H*/
+#endif /* _AUBIO_TSS_H */

src/synth/sampler.h

@@ -19 +19 @@
 */
 
-#ifndef _AUBIO_SYNTH_SAMPLER_H
-#define _AUBIO_SYNTH_SAMPLER_H
+#ifndef _AUBIO_SAMPLER_H
+#define _AUBIO_SAMPLER_H
 
 /** \file
@@ -138 +138 @@
 #endif
 
-#endif /* _AUBIO_SYNTH_SAMPLER_H */
+#endif /* _AUBIO_SAMPLER_H */

src/synth/wavetable.h

@@ -19 +19 @@
 */
 
-#ifndef _AUBIO_SYNTH_WAVETABLE_H
-#define _AUBIO_SYNTH_WAVETABLE_H
+#ifndef _AUBIO_WAVETABLE_H
+#define _AUBIO_WAVETABLE_H
 
 /** \file
@@ -176 +176 @@
 #endif
 
-#endif /* _AUBIO_SYNTH_WAVETABLE_H */
+#endif /* _AUBIO_WAVETABLE_H */

src/tempo/beattracking.h

@@ -1 +1 @@
 /*
-  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.
@@ -37 +37 @@
   
 */
-#ifndef BEATTRACKING_H
-#define BEATTRACKING_H
+#ifndef _AUBIO_BEATTRACKING_H
+#define _AUBIO_BEATTRACKING_H
 
 #ifdef __cplusplus
@@ -99 +99 @@
 #endif
 
-#endif /* BEATTRACKING_H */
+#endif /* _AUBIO_BEATTRACKING_H */

src/tempo/tempo.h

@@ -1 +1 @@
 /*
-  Copyright (C) 2006-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2006-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
@@ -31 +31 @@
 */
 
-#ifndef TEMPO_H
-#define TEMPO_H
+#ifndef _AUBIO_TEMPO_H
+#define _AUBIO_TEMPO_H
 
 #ifdef __cplusplus
@@ -134 +134 @@
 #endif
 
-#endif /* TEMPO_H */
+#endif /* _AUBIO_TEMPO_H */

src/temporal/a_weighting.h

@@ -1 +1 @@
 /*
-  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 +19 @@
 */
 
-#ifndef _ADESIGN_H
-#define _ADESIGN_H
+#ifndef _AUBIO_FILTER_A_DESIGN_H
+#define _AUBIO_FILTER_A_DESIGN_H
 
 /** \file
@@ -86 +86 @@
 #endif
 
-#endif /* _ADESIGN_H */
+#endif /* _AUBIO_FILTER_A_DESIGN_H */

src/temporal/biquad.h

@@ -1 +1 @@
 /*
-  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 +19 @@
 */
 
-#ifndef BIQUAD_H
-#define BIQUAD_H
+#ifndef _AUBIO_FILTER_BIQUAD_H
+#define _AUBIO_FILTER_BIQUAD_H
 
 /** \file 
@@ -73 +73 @@
 #endif
 
-#endif /*BIQUAD_H*/
+#endif /* _AUBIO_FILTER_BIQUAD_H */

src/temporal/c_weighting.h

@@ -1 +1 @@
 /*
-  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 +19 @@
 */
 
-#ifndef _CDESIGN_H
-#define _CDESIGN_H
+#ifndef _AUBIO_FILTER_C_DESIGN_H
+#define _AUBIO_FILTER_C_DESIGN_H
 
 /** \file
@@ -86 +86 @@
 #endif
 
-#endif /* _CDESIGN_H */
+#endif /* _AUBIO_FILTER_C_DESIGN_H */

src/temporal/filter.h

@@ -1 +1 @@
 /*
-  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 +19 @@
 */
 
-#ifndef FILTER_H
-#define FILTER_H
+#ifndef _AUBIO_FILTER_H
+#define _AUBIO_FILTER_H
 
 /** \file 
@@ -174 +174 @@
 #endif
 
-#endif /*FILTER_H*/
+#endif /* _AUBIO_FILTER_H */

src/temporal/resampler.h

@@ -1 +1 @@
 /*
-  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 +19 @@
 */
 
-#ifndef _RESAMPLE_H
-#define _RESAMPLE_H
+#ifndef _AUBIO_RESAMPLER_H
+#define _AUBIO_RESAMPLER_H
 
 /** \file
@@ -63 +63 @@
 #endif
 
-#endif /* _RESAMPLE_H */
+#endif /* _AUBIO_RESAMPLER_H */

src/types.h

@@ -1 +1 @@
 /*
-  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 +19 @@
 */
 
-#ifndef AUBIO_TYPES_H
-#define AUBIO_TYPES_H
+#ifndef _AUBIO__TYPES_H
+#define _AUBIO__TYPES_H
 
 /** \file
@@ -68 +68 @@
 #endif
 
-#endif/*AUBIO_TYPES_H*/
+#endif /* _AUBIO__TYPES_H */

src/utils/hist.h

@@ -1 +1 @@
 /*
-  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 +26 @@
  */
 
-#ifndef HIST_H
-#define HIST_H
+#ifndef _AUBIO_HIST_H
+#define _AUBIO_HIST_H
 
 #ifdef __cplusplus
@@ -61 +61 @@
 #endif
 
-#endif
+#endif /* _AUBIO_HIST_H */

src/utils/parameter.h

@@ -158 +158 @@
 
 #endif /* _AUBIO_PARAMETER_H */
-

src/utils/scale.h

@@ -1 +1 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
@@ -29 +29 @@
  
 */
-#ifndef SCALE_H
-#define SCALE_H
+#ifndef _AUBIO_SCALE_H
+#define _AUBIO_SCALE_H
 
 #ifdef __cplusplus
@@ -78 +78 @@
 #endif 
 
-#endif
+#endif /* _AUBIO_SCALE_H */

src/vecutils.h

@@ -1 +1 @@
 /*
-  Copyright (C) 2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2009-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
@@ -25 +25 @@
  */
 
-#ifndef _VECUTILS_H
-#define _VECUTILS_H
+#ifndef _AUBIO__VECUTILS_H
+#define _AUBIO__VECUTILS_H
 
 #ifdef __cplusplus
@@ -192 +192 @@
 #endif
 
-#endif /*_VECUTILS_H*/
+#endif /* _AUBIO__VECUTILS_H */