src/: move tempo files to src/tempo, continue moving pitch and onset files

diff --git a/src/Makefile.am b/src/Makefile.am
index 5e25661387dfc1881e231cbba9465abf56a4e76a..f29dd3bd284a6a5836d820a1f2706f5d189b411f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,19 +10,19 @@ pkginclude_HEADERS = aubio.h \
        hist.h \
        scale.h \
        resample.h \
-       onset/onsetdetection.h \
        tss.h \
-       peakpick.h \
        biquad.h \
-       pitchdetection.h \
+       pitch/pitchdetection.h \
        pitch/pitchmcomb.h \
        pitch/pitchyin.h \
        pitch/pitchschmitt.h \
        pitch/pitchfcomb.h \
        pitch/pitchyinfft.h \
-       beattracking.h \
-       onset.h \
-       tempo.h \
+       onset/onset.h \
+       onset/onsetdetection.h \
+       onset/peakpick.h \
+       tempo/tempo.h \
+       tempo/beattracking.h \
        filter.h \
        filterbank.h \
        mfcc.h
@@ -48,16 +48,12 @@ libaubio_la_SOURCES = aubio.h \
        scale.h \
        resample.c \
        resample.h \
-       onset/onsetdetection.c \
-       onset/onsetdetection.h \
        tss.c \
        tss.h \
-       peakpick.c \
-       peakpick.h \
        biquad.c \
        biquad.h \
-       pitchdetection.c \
-       pitchdetection.h \
+       pitch/pitchdetection.c \
+       pitch/pitchdetection.h \
        pitch/pitchmcomb.c \
        pitch/pitchmcomb.h \
        pitch/pitchyin.c \
@@ -68,12 +64,16 @@ libaubio_la_SOURCES = aubio.h \
        pitch/pitchfcomb.h \
        pitch/pitchyinfft.c \
        pitch/pitchyinfft.h \
-       beattracking.c \
-       beattracking.h \
-       onset.c \
-       onset.h \
-       tempo.c \
-       tempo.h \
+       onset/onset.c \
+       onset/onset.h \
+       onset/onsetdetection.c \
+       onset/onsetdetection.h \
+       onset/peakpick.c \
+       onset/peakpick.h \
+       tempo/tempo.c \
+       tempo/tempo.h \
+       tempo/beattracking.c \
+       tempo/beattracking.h \
        filter.c \
        filter.h \
        filterbank.c \

diff --git a/src/aubio.h b/src/aubio.h
index c0a1acf2f3df2e1f3cd5d6e0175f9a0023e52f61..73af8bbff608ab706e150fa2778566842f0b4028 100644 (file)
--- a/src/aubio.h
+++ b/src/aubio.h
@@ -66,19 +66,19 @@ extern "C" {
 #include "hist.h"
 #include "tss.h"
 #include "resample.h"
-#include "peakpick.h"
 #include "biquad.h"
 #include "filter.h"
-#include "pitchdetection.h"
+#include "pitch/pitchdetection.h"
 #include "pitch/pitchmcomb.h"
 #include "pitch/pitchyin.h"
 #include "pitch/pitchyinfft.h"
 #include "pitch/pitchschmitt.h"
 #include "pitch/pitchfcomb.h"
-#include "beattracking.h"
-#include "onset/detection.h"
-#include "onset.h"
-#include "tempo.h"
+#include "onset/onsetdetection.h"
+#include "onset/onset.h"
+#include "onset/peakpick.h"
+#include "tempo/beattracking.h"
+#include "tempo/tempo.h"
 #include "filterbank.h"
 #include "mfcc.h"
 

diff --git a/src/onset.c b/src/onset/onset.c
similarity index 99%
rename from src/onset.c
rename to src/onset/onset.c
index 26445bd9de2c9730c2d562500f25ecbd189d6575..e4bc5dde52244abbd7f6f6e6968586fa46f42f48 100644 (file)
--- a/src/onset.c
+++ b/src/onset/onset.c
@@ -19,7 +19,7 @@
 
 #include "aubio_priv.h"
 #include "sample.h"
-#include "onset/detection.h"
+#include "onset/onsetdetection.h"
 #include "phasevoc.h"
 #include "peakpick.h"
 #include "mathutils.h"

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

diff --git a/src/peakpick.c b/src/onset/peakpick.c
similarity index 100%
rename from src/peakpick.c
rename to src/onset/peakpick.c

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

diff --git a/src/pitchdetection.c b/src/pitch/pitchdetection.c
similarity index 100%
rename from src/pitchdetection.c
rename to src/pitch/pitchdetection.c

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

diff --git a/src/beattracking.c b/src/tempo/beattracking.c
similarity index 100%
rename from src/beattracking.c
rename to src/tempo/beattracking.c

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

diff --git a/src/tempo.c b/src/tempo/tempo.c
similarity index 98%
rename from src/tempo.c
rename to src/tempo/tempo.c
index 18d9a549abb464ce47b1bbc16c9ab0d629d75eda..1794bae32bdc3ae20b4091bb204c8979972758df 100644 (file)
--- a/src/tempo.c
+++ b/src/tempo/tempo.c
@@ -19,10 +19,10 @@
 
 #include "aubio_priv.h"
 #include "sample.h"
-#include "onset/detection.h"
-#include "beattracking.h"
+#include "onset/onsetdetection.h"
+#include "tempo/beattracking.h"
 #include "phasevoc.h"
-#include "peakpick.h"
+#include "onset/peakpick.h"
 #include "mathutils.h"
 #include "tempo.h"
 

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