src/: more moving and splitting

diff --git a/src/Makefile.am b/src/Makefile.am
index f29dd3bd284a6a5836d820a1f2706f5d189b411f..7afd4d40bbd6d52e5cb4d679de73b4a75ba4510f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,17 +1,19 @@
 noinst_HEADERS = aubio_priv.h
 pkginclude_HEADERS = aubio.h \
        types.h \
-       phasevoc.h \
-       mathutils.h \
-       fft.h \
-       sample.h \
        fvec.h \
        cvec.h \
-       hist.h \
-       scale.h \
-       resample.h \
-       tss.h \
-       biquad.h \
+       mathutils.h \
+       utils/hist.h \
+       utils/scale.h \
+       temporal/resample.h \
+       temporal/biquad.h \
+       temporal/filter.h \
+       spectral/filterbank.h \
+       spectral/mfcc.c \
+       spectral/phasevoc.h \
+       spectral/fft.h \
+       spectral/tss.h \
        pitch/pitchdetection.h \
        pitch/pitchmcomb.h \
        pitch/pitchyin.h \
@@ -22,36 +24,39 @@ pkginclude_HEADERS = aubio.h \
        onset/onsetdetection.h \
        onset/peakpick.h \
        tempo/tempo.h \
-       tempo/beattracking.h \
-       filter.h \
-       filterbank.h \
-       mfcc.h
+       tempo/beattracking.h
 
 nodist_pkginclude_HEADERS = config.h
 
 lib_LTLIBRARIES = libaubio.la 
 libaubio_la_SOURCES = aubio.h \
        types.h \
-       phasevoc.c \
-       phasevoc.h \
-       mathutils.c \
-       mathutils.h \
-       fft.c \
-       fft.h \
        fvec.c \
        fvec.h \
        cvec.c \
        cvec.h \
-       hist.c \
-       hist.h \
-       scale.c \
-       scale.h \
-       resample.c \
-       resample.h \
-       tss.c \
-       tss.h \
-       biquad.c \
-       biquad.h \
+       mathutils.c \
+       mathutils.h \
+       utils/hist.c \
+       utils/hist.h \
+       utils/scale.c \
+       utils/scale.h \
+       temporal/resample.c \
+       temporal/resample.h \
+       temporal/biquad.c \
+       temporal/biquad.h \
+       temporal/filter.c \
+       temporal/filter.h \
+       spectral/filterbank.c \
+       spectral/filterbank.h \
+       spectral/mfcc.h \
+       spectral/mfcc.c \
+       spectral/phasevoc.c \
+       spectral/phasevoc.h \
+       spectral/fft.c \
+       spectral/fft.h \
+       spectral/tss.c \
+       spectral/tss.h \
        pitch/pitchdetection.c \
        pitch/pitchdetection.h \
        pitch/pitchmcomb.c \
@@ -73,13 +78,7 @@ libaubio_la_SOURCES = aubio.h \
        tempo/tempo.c \
        tempo/tempo.h \
        tempo/beattracking.c \
-       tempo/beattracking.h \
-       filter.c \
-       filter.h \
-       filterbank.c \
-       filterbank.h \
-       mfcc.h \
-       mfcc.c 
+       tempo/beattracking.h
 
 AM_CFLAGS = @AUBIO_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@
 libaubio_la_LIBADD = @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LTLIBOBJS@

diff --git a/src/aubio.h b/src/aubio.h
index 73af8bbff608ab706e150fa2778566842f0b4028..4515606bc181d16436151814b442dc2405270659 100644 (file)
--- a/src/aubio.h
+++ b/src/aubio.h
@@ -59,15 +59,15 @@ extern "C" {
 /* in this order */
 #include "types.h"
 #include "sample.h"
-#include "fft.h"
-#include "phasevoc.h"
+#include "spectral/fft.h"
+#include "spectral/phasevoc.h"
 #include "mathutils.h"
-#include "scale.h"
-#include "hist.h"
-#include "tss.h"
-#include "resample.h"
-#include "biquad.h"
-#include "filter.h"
+#include "utils/scale.h"
+#include "utils/hist.h"
+#include "spectral/tss.h"
+#include "temporal/resample.h"
+#include "temporal/biquad.h"
+#include "temporal/filter.h"
 #include "pitch/pitchdetection.h"
 #include "pitch/pitchmcomb.h"
 #include "pitch/pitchyin.h"
@@ -79,8 +79,8 @@ extern "C" {
 #include "onset/peakpick.h"
 #include "tempo/beattracking.h"
 #include "tempo/tempo.h"
-#include "filterbank.h"
-#include "mfcc.h"
+#include "spectral/filterbank.h"
+#include "spectral/mfcc.h"
 
 #ifdef __cplusplus
 } /* extern "C" */

diff --git a/src/onset/onset.c b/src/onset/onset.c
index e4bc5dde52244abbd7f6f6e6968586fa46f42f48..084f8de755c19685e211aab7e4f5069279244261 100644 (file)
--- a/src/onset/onset.c
+++ b/src/onset/onset.c
@@ -20,10 +20,10 @@
 #include "aubio_priv.h"
 #include "sample.h"
 #include "onset/onsetdetection.h"
-#include "phasevoc.h"
-#include "peakpick.h"
+#include "spectral/phasevoc.h"
+#include "onset/peakpick.h"
 #include "mathutils.h"
-#include "onset.h"
+#include "onset/onset.h"
 
 /** structure to store object state */
 struct _aubio_onset_t {

diff --git a/src/onset/onsetdetection.c b/src/onset/onsetdetection.c
index 2e4b1baeccab8dab1d00f5fa9e4d738223aa644d..0dd52cf124f40236e5cacd02704ee985e5765556 100644 (file)
--- a/src/onset/onsetdetection.c
+++ b/src/onset/onsetdetection.c
@@ -19,9 +19,9 @@
 
 #include "aubio_priv.h"
 #include "sample.h"
-#include "fft.h"
+#include "spectral/fft.h"
 #include "mathutils.h"
-#include "hist.h"
+#include "utils/hist.h"
 #include "onset/onsetdetection.h"
 
 

diff --git a/src/onset/peakpick.c b/src/onset/peakpick.c
index 9f128e8798e6bba9616f9c5d20ea75c579ec5216..f9c93369d0f3b4d33fc644e46ce3d7016dbbe13e 100644 (file)
--- a/src/onset/peakpick.c
+++ b/src/onset/peakpick.c
@@ -20,8 +20,8 @@
 #include "aubio_priv.h"
 #include "sample.h"
 #include "mathutils.h"
-#include "biquad.h"
-#include "peakpick.h"
+#include "temporal/biquad.h"
+#include "onset/peakpick.h"
 
 /* peak picking parameters, default values in brackets
  *

diff --git a/src/pitch/pitchdetection.c b/src/pitch/pitchdetection.c
index 18cc89bc2ae678631007d2b2e1c3769e0f3b718c..c51a187412072599ffffe28342e272cd7864aa15 100644 (file)
--- a/src/pitch/pitchdetection.c
+++ b/src/pitch/pitchdetection.c
@@ -18,15 +18,15 @@
 
 #include "aubio_priv.h"
 #include "sample.h"
-#include "phasevoc.h"
+#include "spectral/phasevoc.h"
 #include "mathutils.h"
-#include "filter.h"
+#include "temporal/filter.h"
 #include "pitch/pitchmcomb.h"
 #include "pitch/pitchyin.h"
 #include "pitch/pitchfcomb.h"
 #include "pitch/pitchschmitt.h"
 #include "pitch/pitchyinfft.h"
-#include "pitchdetection.h"
+#include "pitch/pitchdetection.h"
 
 typedef smpl_t (*aubio_pitchdetection_func_t)
   (aubio_pitchdetection_t *p, fvec_t * ibuf);

diff --git a/src/pitch/pitchfcomb.c b/src/pitch/pitchfcomb.c
index e894b2bc8cc7a7eccdc2a74fbfdcff1bebb921cc..e6c884496fa6805531cb41c28b1215d9dbfbcaf8 100644 (file)
--- a/src/pitch/pitchfcomb.c
+++ b/src/pitch/pitchfcomb.c
@@ -20,7 +20,7 @@
 #include "aubio_priv.h"
 #include "sample.h"
 #include "mathutils.h"
-#include "fft.h"
+#include "spectral/fft.h"
 #include "pitch/pitchfcomb.h"
 
 #define MAX_PEAKS 8

diff --git a/src/pitch/pitchyinfft.c b/src/pitch/pitchyinfft.c
index e81b490c9492e16dac54fdb7424335f615ac622e..12d1051db5ab5af2bd29c8bf5118d214b2d3607a 100644 (file)
--- a/src/pitch/pitchyinfft.c
+++ b/src/pitch/pitchyinfft.c
@@ -19,7 +19,7 @@
 #include "aubio_priv.h"
 #include "sample.h"
 #include "mathutils.h"
-#include "fft.h"
+#include "spectral/fft.h"
 #include "pitch/pitchyinfft.h"
 
 /** pitch yinfft structure */

diff --git a/src/fft.c b/src/spectral/fft.c
similarity index 99%
rename from src/fft.c
rename to src/spectral/fft.c
index 3521febabf670381c1ad936ba37c790a35831044..8bff6ac192d6c4b9afcade2689b169b04255a1d8 100644 (file)
--- a/src/fft.c
+++ b/src/spectral/fft.c
@@ -21,7 +21,7 @@
 #include "fvec.h"
 #include "cvec.h"
 #include "mathutils.h"
-#include "fft.h"
+#include "spectral/fft.h"
 
 #if FFTW3F_SUPPORT
 #define fftw_malloc            fftwf_malloc

diff --git a/src/fft.h b/src/spectral/fft.h
similarity index 100%
rename from src/fft.h
rename to src/spectral/fft.h

diff --git a/src/filterbank.c b/src/spectral/filterbank.c
similarity index 99%
rename from src/filterbank.c
rename to src/spectral/filterbank.c
index c009e21e8d7afdfa34c07c5a71e36e6876acf2ae..aa1336bfc384e1a64fa964a2c4dc959f88b72ff1 100644 (file)
--- a/src/filterbank.c
+++ b/src/spectral/filterbank.c
@@ -21,7 +21,7 @@
 
 #include "aubio_priv.h"
 #include "sample.h"
-#include "filterbank.h"
+#include "spectral/filterbank.h"
 #include "mathutils.h"
 
 #define VERY_SMALL_NUMBER 2e-42

diff --git a/src/filterbank.h b/src/spectral/filterbank.h
similarity index 100%
rename from src/filterbank.h
rename to src/spectral/filterbank.h

diff --git a/src/mfcc.c b/src/spectral/mfcc.c
similarity index 97%
rename from src/mfcc.c
rename to src/spectral/mfcc.c
index 2420d8037e4a12e6a48f88623e8f249a3771ec73..a7ac9d59a631a4ef077e7709cdab312c2b1eeb5f 100644 (file)
--- a/src/mfcc.c
+++ b/src/spectral/mfcc.c
@@ -22,10 +22,9 @@
 
 #include "aubio_priv.h"
 #include "sample.h"
-#include "fft.h"
-#include "filterbank.h"
-#include "mfcc.h"
-#include "math.h"
+#include "spectral/fft.h"
+#include "spectral/filterbank.h"
+#include "spectral/mfcc.h"
 
 /** Internal structure for mfcc object **/
 

diff --git a/src/mfcc.h b/src/spectral/mfcc.h
similarity index 97%
rename from src/mfcc.h
rename to src/spectral/mfcc.h
index 6acc6cd232c64371087a4b343b61bcf4c0028cc1..0c873c5414127d883eb6dd86fd4b07ce3687cb53 100644 (file)
--- a/src/mfcc.h
+++ b/src/spectral/mfcc.h
@@ -29,9 +29,6 @@
 extern "C" {
 #endif
 
-#include "sample.h"
-#include "filterbank.h"
-
 typedef struct aubio_mfcc_t_ aubio_mfcc_t;
 
 /** create mfcc object

diff --git a/src/phasevoc.c b/src/spectral/phasevoc.c
similarity index 98%
rename from src/phasevoc.c
rename to src/spectral/phasevoc.c
index b04b106f94a7becb18ccb82a1ba628f75d757a92..d7ee16892619e9cda5b3377c013607f65fa312fc 100644 (file)
--- a/src/phasevoc.c
+++ b/src/spectral/phasevoc.c
@@ -20,9 +20,9 @@
 #include "aubio_priv.h"
 #include "fvec.h"
 #include "cvec.h"
-#include "fft.h"
 #include "mathutils.h"
-#include "phasevoc.h"
+#include "spectral/fft.h"
+#include "spectral/phasevoc.h"
 
 /** phasevocoder internal object */
 struct _aubio_pvoc_t {

diff --git a/src/phasevoc.h b/src/spectral/phasevoc.h
similarity index 100%
rename from src/phasevoc.h
rename to src/spectral/phasevoc.h

diff --git a/src/tss.c b/src/spectral/tss.c
similarity index 99%
rename from src/tss.c
rename to src/spectral/tss.c
index da5a585f80997a1cceb0641aee7d317cd7ccc781..0cbe2de35d7811758f591c1f7d8547575eca9eb7 100644 (file)
--- a/src/tss.c
+++ b/src/spectral/tss.c
@@ -22,7 +22,7 @@
 #include "aubio_priv.h"
 #include "sample.h"
 #include "mathutils.h"
-#include "tss.h"
+#include "spectral/tss.h"
 
 struct _aubio_tss_t 
 {

diff --git a/src/tss.h b/src/spectral/tss.h
similarity index 100%
rename from src/tss.h
rename to src/spectral/tss.h

diff --git a/src/tempo/beattracking.c b/src/tempo/beattracking.c
index e67a6082c1a01fc8224d7c1fade0a5d7504aa1ce..7066e1c5e5f2597830ecef46e9f9f0e4e3441f7e 100644 (file)
--- a/src/tempo/beattracking.c
+++ b/src/tempo/beattracking.c
@@ -20,7 +20,7 @@
 #include "aubio_priv.h"
 #include "sample.h"
 #include "mathutils.h"
-#include "beattracking.h"
+#include "tempo/beattracking.h"
 
 uint_t fvec_gettimesig(smpl_t * acf, uint_t acflen, uint_t gp);
 void aubio_beattracking_checkstate(aubio_beattracking_t * bt);

diff --git a/src/tempo/tempo.c b/src/tempo/tempo.c
index 1794bae32bdc3ae20b4091bb204c8979972758df..6408ba66e1ec2075c9b74e5210a4a1ea70aa06f5 100644 (file)
--- a/src/tempo/tempo.c
+++ b/src/tempo/tempo.c
@@ -21,10 +21,10 @@
 #include "sample.h"
 #include "onset/onsetdetection.h"
 #include "tempo/beattracking.h"
-#include "phasevoc.h"
+#include "spectral/phasevoc.h"
 #include "onset/peakpick.h"
 #include "mathutils.h"
-#include "tempo.h"
+#include "tempo/tempo.h"
 
 /* structure to store object state */
 struct _aubio_tempo_t {

diff --git a/src/biquad.c b/src/temporal/biquad.c
similarity index 98%
rename from src/biquad.c
rename to src/temporal/biquad.c
index 327abfa18fb18e9201db1ad8f1d3848120dd0022..1775125f6aaba1cbeffb95313db45e8223b8fdcd 100644 (file)
--- a/src/biquad.c
+++ b/src/temporal/biquad.c
@@ -20,7 +20,7 @@
 #include "aubio_priv.h"
 #include "sample.h"
 #include "mathutils.h"
-#include "biquad.h"
+#include "temporal/biquad.h"
 
 /** \note this file needs to be in double or more less precision would lead to large
  * errors in the output 

diff --git a/src/biquad.h b/src/temporal/biquad.h
similarity index 100%
rename from src/biquad.h
rename to src/temporal/biquad.h

diff --git a/src/filter.c b/src/temporal/filter.c
similarity index 99%
rename from src/filter.c
rename to src/temporal/filter.c
index 58c6191b48fb2a742c995ae640bd53c63f8d583d..f82cd1f017d37de35b8028e67f12fa447348630c 100644 (file)
--- a/src/filter.c
+++ b/src/temporal/filter.c
@@ -24,7 +24,7 @@
 #include "aubio_priv.h"
 #include "sample.h"
 #include "mathutils.h"
-#include "filter.h"
+#include "temporal/filter.h"
 
 struct _aubio_filter_t {
   uint_t order;

diff --git a/src/filter.h b/src/temporal/filter.h
similarity index 100%
rename from src/filter.h
rename to src/temporal/filter.h

diff --git a/src/resample.c b/src/temporal/resample.c
similarity index 98%
rename from src/resample.c
rename to src/temporal/resample.c
index 8d9366ec58c555a69ff2b08394014035ca2bb59f..05d7a88d4a9263d0e9a17450a11c4c16a6f0890f 100644 (file)
--- a/src/resample.c
+++ b/src/temporal/resample.c
@@ -22,7 +22,7 @@
 
 #include "aubio_priv.h"
 #include "sample.h"
-#include "resample.h"
+#include "temporal/resample.h"
 
 struct _aubio_resampler_t {
        SRC_DATA  *proc;

diff --git a/src/resample.h b/src/temporal/resample.h
similarity index 100%
rename from src/resample.h
rename to src/temporal/resample.h

diff --git a/src/hist.c b/src/utils/hist.c
similarity index 98%
rename from src/hist.c
rename to src/utils/hist.c
index e97287b411c40afc813399a463787c2dc011e19e..7337ec46b5ab2f10a9bed3deaa764ed35ddbdb45 100644 (file)
--- a/src/hist.c
+++ b/src/utils/hist.c
@@ -18,9 +18,9 @@
 
 #include "aubio_priv.h"
 #include "sample.h"
-#include "scale.h"
+#include "utils/scale.h"
 #include "mathutils.h" //vec_min vec_max
-#include "hist.h"
+#include "utils/hist.h"
 
 /********
  * Object Structure

diff --git a/src/hist.h b/src/utils/hist.h
similarity index 100%
rename from src/hist.h
rename to src/utils/hist.h

diff --git a/src/scale.c b/src/utils/scale.c
similarity index 98%
rename from src/scale.c
rename to src/utils/scale.c
index dff32b037b5440d6c9b5451a21da8ba516433c95..d348326e986e8237bc016161ea12660cc21ac5bf 100644 (file)
--- a/src/scale.c
+++ b/src/utils/scale.c
@@ -19,7 +19,7 @@
 
 #include "aubio_priv.h"
 #include "sample.h"
-#include "scale.h"
+#include "utils/scale.h"
 
 struct _aubio_scale_t {
   smpl_t ilow;

diff --git a/src/scale.h b/src/utils/scale.h
similarity index 100%
rename from src/scale.h
rename to src/utils/scale.h