shithub: aubio

Info  •  Files  •  Log  •  Branches

remove src/sample.h

--- 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"

--- a/src/aubio.h

+++ b/src/aubio.h

@@ -58,7 +58,8 @@

 /* 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"

--- 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);

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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);

--- 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"

--- 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"

--- a/src/sample.h

+++ /dev/null

@@ -1,26 +1,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 */

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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"

--- 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 {

--- 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"

--- 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 {