remove src/sample.h

diff --git a/ext/sndfileio.c b/ext/sndfileio.c
index edafd2b4534fa1e04df06026f84bbd9e438bc9b0..1065b40bb2e51ae3951e395a21753ffa559f6a61 100644 (file)
--- a/ext/sndfileio.c
+++ b/ext/sndfileio.c
@@ -22,7 +22,7 @@
 #include <sndfile.h>
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
 #include "sndfileio.h"
 #include "mathutils.h"
 

diff --git a/src/aubio.h b/src/aubio.h
index 862b055147efe2a5b1a79f7e60436c63362f1953..81802b8e33feacade4a5ca7e19853a8606ebd3b7 100644 (file)
--- a/src/aubio.h
+++ b/src/aubio.h
@@ -58,7 +58,8 @@ extern "C" {
  
 /* in this order */
 #include "types.h"
-#include "sample.h"
+#include "fvec.h"
+#include "cvec.h"
 #include "mathutils.h"
 #include "utils/scale.h"
 #include "utils/hist.h"

diff --git a/src/fvec.c b/src/fvec.c
index 941830bcdddd25c5a7ad97a8864acc13734a5777..4b094f9cf040b9090fa3a37a615e16b2d1043418 100644 (file)
--- a/src/fvec.c
+++ b/src/fvec.c
@@ -18,7 +18,7 @@
 */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
 
 fvec_t * new_fvec( uint_t length, uint_t channels) {
   fvec_t * s = AUBIO_NEW(fvec_t);

diff --git a/src/mathutils.c b/src/mathutils.c
index 4193fa3195dba205fcee9249f9fb64a5e27fdf0e..1ecb2fd65731ac95196fd1d3d4c2e452d4f120c6 100644 (file)
--- a/src/mathutils.c
+++ b/src/mathutils.c
@@ -20,7 +20,7 @@
 /* see in mathutils.h for doc */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
 #include "mathutils.h"
 #include "config.h"
 

diff --git a/src/onset/onset.c b/src/onset/onset.c
index 084f8de755c19685e211aab7e4f5069279244261..3b30a7b3c6a0782282a6f80dd006bd88761d6933 100644 (file)
--- a/src/onset/onset.c
+++ b/src/onset/onset.c
@@ -18,7 +18,8 @@
 */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
+#include "cvec.h"
 #include "onset/onsetdetection.h"
 #include "spectral/phasevoc.h"
 #include "onset/peakpick.h"

diff --git a/src/onset/onsetdetection.c b/src/onset/onsetdetection.c
index b7d42055680d212e9461fed0c14765a42e925cc2..dc8f6fa472d6a53c4235a21f78ce25fe73276ea1 100644 (file)
--- a/src/onset/onsetdetection.c
+++ b/src/onset/onsetdetection.c
@@ -18,7 +18,8 @@
 */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
+#include "cvec.h"
 #include "spectral/fft.h"
 #include "mathutils.h"
 #include "utils/hist.h"

diff --git a/src/onset/peakpick.c b/src/onset/peakpick.c
index f9c93369d0f3b4d33fc644e46ce3d7016dbbe13e..6b320bd183bcc3175dd47421e8ec32db9dee89c6 100644 (file)
--- a/src/onset/peakpick.c
+++ b/src/onset/peakpick.c
@@ -18,7 +18,7 @@
 */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
 #include "mathutils.h"
 #include "temporal/biquad.h"
 #include "onset/peakpick.h"

diff --git a/src/pitch/pitchdetection.c b/src/pitch/pitchdetection.c
index c51a187412072599ffffe28342e272cd7864aa15..5cc2985ae46cdf72e13132e1d404fdeb2a8bb335 100644 (file)
--- a/src/pitch/pitchdetection.c
+++ b/src/pitch/pitchdetection.c
@@ -17,7 +17,8 @@
    */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
+#include "cvec.h"
 #include "spectral/phasevoc.h"
 #include "mathutils.h"
 #include "temporal/filter.h"

diff --git a/src/pitch/pitchfcomb.c b/src/pitch/pitchfcomb.c
index e6c884496fa6805531cb41c28b1215d9dbfbcaf8..92d60f23027c8f76d7a0cab7970b53cce140a4ca 100644 (file)
--- a/src/pitch/pitchfcomb.c
+++ b/src/pitch/pitchfcomb.c
@@ -18,7 +18,8 @@
 */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
+#include "cvec.h"
 #include "mathutils.h"
 #include "spectral/fft.h"
 #include "pitch/pitchfcomb.h"

diff --git a/src/pitch/pitchmcomb.c b/src/pitch/pitchmcomb.c
index 1d07c6fa1339136331b2a10ddeee41c965b5d20c..f74351127f5add3c952473a1dbb5684f8cc448cf 100644 (file)
--- a/src/pitch/pitchmcomb.c
+++ b/src/pitch/pitchmcomb.c
@@ -18,7 +18,8 @@
 */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
+#include "cvec.h"
 #include "mathutils.h"
 #include "pitch/pitchmcomb.h"
 

diff --git a/src/pitch/pitchschmitt.c b/src/pitch/pitchschmitt.c
index ceabd78b1a156eab77421b0482ef4fede150971a..0fa5209a0f4c3e5f69d924740e8c16e0eaa701c9 100644 (file)
--- a/src/pitch/pitchschmitt.c
+++ b/src/pitch/pitchschmitt.c
@@ -18,7 +18,7 @@
 */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
 #include "pitch/pitchschmitt.h"
 
 smpl_t aubio_schmittS16LE (aubio_pitchschmitt_t *p, uint_t nframes, signed short int *indata);

diff --git a/src/pitch/pitchyin.c b/src/pitch/pitchyin.c
index a77baef252fdf04d43f26d421ad4e7978c805ccf..88b785f693626cfeb0b801fe099688a83bcd8a7f 100644 (file)
--- a/src/pitch/pitchyin.c
+++ b/src/pitch/pitchyin.c
@@ -26,7 +26,7 @@
  */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
 #include "mathutils.h"
 #include "pitch/pitchyin.h"
 

diff --git a/src/pitch/pitchyinfft.c b/src/pitch/pitchyinfft.c
index 12d1051db5ab5af2bd29c8bf5118d214b2d3607a..72389b3c06593ac77f61a35c326e77e3ffe6b9ee 100644 (file)
--- a/src/pitch/pitchyinfft.c
+++ b/src/pitch/pitchyinfft.c
@@ -17,7 +17,8 @@
 */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
+#include "cvec.h"
 #include "mathutils.h"
 #include "spectral/fft.h"
 #include "pitch/pitchyinfft.h"

diff --git a/src/sample.h b/src/sample.h
deleted file mode 100644 (file)
index c8b03fb..0000000
--- a/src/sample.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-   Copyright (C) 2003-2007 Paul Brossier <piem@piem.org>
-
-   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.
-
-   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.
-
-*/
-
-#ifndef _SAMPLE_H
-#define _SAMPLE_H
-
-#include "fvec.h"
-#include "cvec.h"
-
-#endif /* _SAMPLE_H */

diff --git a/src/spectral/filterbank.c b/src/spectral/filterbank.c
index aa1336bfc384e1a64fa964a2c4dc959f88b72ff1..aacca4fd7db28fe7c62a6a89f5672e6f80f4b424 100644 (file)
--- a/src/spectral/filterbank.c
+++ b/src/spectral/filterbank.c
@@ -20,7 +20,8 @@
 
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
+#include "cvec.h"
 #include "spectral/filterbank.h"
 #include "mathutils.h"
 

diff --git a/src/spectral/mfcc.c b/src/spectral/mfcc.c
index a7ac9d59a631a4ef077e7709cdab312c2b1eeb5f..a8315a76baca4154a76b455678f1a2e4dcb29002 100644 (file)
--- a/src/spectral/mfcc.c
+++ b/src/spectral/mfcc.c
@@ -21,7 +21,8 @@
 */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
+#include "cvec.h"
 #include "spectral/fft.h"
 #include "spectral/filterbank.h"
 #include "spectral/mfcc.h"

diff --git a/src/spectral/tss.c b/src/spectral/tss.c
index 0cbe2de35d7811758f591c1f7d8547575eca9eb7..18673d5ac6c30e57ebcb43eb8601441058d03521 100644 (file)
--- a/src/spectral/tss.c
+++ b/src/spectral/tss.c
@@ -20,7 +20,8 @@
 /* default values : alfa=4, beta=3, threshold=0.25 */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
+#include "cvec.h"
 #include "mathutils.h"
 #include "spectral/tss.h"
 

diff --git a/src/tempo/beattracking.c b/src/tempo/beattracking.c
index 7066e1c5e5f2597830ecef46e9f9f0e4e3441f7e..c062ac3f3f760077e5e14639f407898010722362 100644 (file)
--- a/src/tempo/beattracking.c
+++ b/src/tempo/beattracking.c
@@ -18,7 +18,7 @@
 */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
 #include "mathutils.h"
 #include "tempo/beattracking.h"
 

diff --git a/src/tempo/tempo.c b/src/tempo/tempo.c
index 6408ba66e1ec2075c9b74e5210a4a1ea70aa06f5..3a006361cf1231c87c4c05f783e5e92e05596578 100644 (file)
--- a/src/tempo/tempo.c
+++ b/src/tempo/tempo.c
@@ -18,7 +18,8 @@
 */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
+#include "cvec.h"
 #include "onset/onsetdetection.h"
 #include "tempo/beattracking.h"
 #include "spectral/phasevoc.h"

diff --git a/src/temporal/biquad.c b/src/temporal/biquad.c
index 1775125f6aaba1cbeffb95313db45e8223b8fdcd..7674ccaae0604ad324158649884eddb89b013abc 100644 (file)
--- a/src/temporal/biquad.c
+++ b/src/temporal/biquad.c
@@ -18,7 +18,7 @@
 */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
 #include "mathutils.h"
 #include "temporal/biquad.h"
 

diff --git a/src/temporal/filter.c b/src/temporal/filter.c
index f82cd1f017d37de35b8028e67f12fa447348630c..7f2349bd350e3b5451609855cdba79b222533624 100644 (file)
--- a/src/temporal/filter.c
+++ b/src/temporal/filter.c
@@ -22,7 +22,7 @@
  * results */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
 #include "mathutils.h"
 #include "temporal/filter.h"
 

diff --git a/src/temporal/resample.c b/src/temporal/resample.c
index 05d7a88d4a9263d0e9a17450a11c4c16a6f0890f..b67b264e7e1e11981cb6565f3af2dd1f5bf562ef 100644 (file)
--- a/src/temporal/resample.c
+++ b/src/temporal/resample.c
@@ -21,7 +21,7 @@
 #include <samplerate.h> /* from libsamplerate */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
 #include "temporal/resample.h"
 
 struct _aubio_resampler_t {

diff --git a/src/utils/hist.c b/src/utils/hist.c
index 7337ec46b5ab2f10a9bed3deaa764ed35ddbdb45..b6e2742320c7f8ecac2efaf9e7448452a7003440 100644 (file)
--- a/src/utils/hist.c
+++ b/src/utils/hist.c
@@ -17,7 +17,7 @@
 */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
 #include "utils/scale.h"
 #include "mathutils.h" //vec_min vec_max
 #include "utils/hist.h"

diff --git a/src/utils/scale.c b/src/utils/scale.c
index d348326e986e8237bc016161ea12660cc21ac5bf..bb64bd34a1d4d95637bc776ee0c55644a80eb8e9 100644 (file)
--- a/src/utils/scale.c
+++ b/src/utils/scale.c
@@ -18,7 +18,7 @@
 */
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
 #include "utils/scale.h"
 
 struct _aubio_scale_t {