From 6c7d49b35493f7802c7834335f47b82f243ea6fa Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Sat, 24 Nov 2007 23:02:29 +0100 Subject: [PATCH] remove src/sample.h --- ext/sndfileio.c | 2 +- src/aubio.h | 3 ++- src/fvec.c | 2 +- src/mathutils.c | 2 +- src/onset/onset.c | 3 ++- src/onset/onsetdetection.c | 3 ++- src/onset/peakpick.c | 2 +- src/pitch/pitchdetection.c | 3 ++- src/pitch/pitchfcomb.c | 3 ++- src/pitch/pitchmcomb.c | 3 ++- src/pitch/pitchschmitt.c | 2 +- src/pitch/pitchyin.c | 2 +- src/pitch/pitchyinfft.c | 3 ++- src/sample.h | 26 -------------------------- src/spectral/filterbank.c | 3 ++- src/spectral/mfcc.c | 3 ++- src/spectral/tss.c | 3 ++- src/tempo/beattracking.c | 2 +- src/tempo/tempo.c | 3 ++- src/temporal/biquad.c | 2 +- src/temporal/filter.c | 2 +- src/temporal/resample.c | 2 +- src/utils/hist.c | 2 +- src/utils/scale.c | 2 +- 24 files changed, 34 insertions(+), 49 deletions(-) delete mode 100644 src/sample.h diff --git a/ext/sndfileio.c b/ext/sndfileio.c index edafd2b4..1065b40b 100644 --- a/ext/sndfileio.c +++ b/ext/sndfileio.c @@ -22,7 +22,7 @@ #include #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 862b0551..81802b8e 100644 --- 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 941830bc..4b094f9c 100644 --- 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 4193fa31..1ecb2fd6 100644 --- 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 084f8de7..3b30a7b3 100644 --- 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 b7d42055..dc8f6fa4 100644 --- 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 f9c93369..6b320bd1 100644 --- 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 c51a1874..5cc2985a 100644 --- 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 e6c88449..92d60f23 100644 --- 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 1d07c6fa..f7435112 100644 --- 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 ceabd78b..0fa5209a 100644 --- 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 a77baef2..88b785f6 100644 --- 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 12d1051d..72389b3c 100644 --- 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 index c8b03fb2..00000000 --- a/src/sample.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - Copyright (C) 2003-2007 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 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 aa1336bf..aacca4fd 100644 --- 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 a7ac9d59..a8315a76 100644 --- 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 0cbe2de3..18673d5a 100644 --- 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 7066e1c5..c062ac3f 100644 --- 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 6408ba66..3a006361 100644 --- 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 1775125f..7674ccaa 100644 --- 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 f82cd1f0..7f2349bd 100644 --- 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 05d7a88d..b67b264e 100644 --- a/src/temporal/resample.c +++ b/src/temporal/resample.c @@ -21,7 +21,7 @@ #include /* 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 7337ec46..b6e27423 100644 --- 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 d348326e..bb64bd34 100644 --- 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 { -- 2.26.2