move pitch methods to pitch/, onset detection functions to onset/

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

diff --git a/src/aubio.h b/src/aubio.h
index af7864464548ada7d9f64f612409dc551e1d4532..c0a1acf2f3df2e1f3cd5d6e0175f9a0023e52f61 100644 (file)
--- a/src/aubio.h
+++ b/src/aubio.h
@@ -64,19 +64,19 @@ extern "C" {
 #include "mathutils.h"
 #include "scale.h"
 #include "hist.h"
-#include "onsetdetection.h"
 #include "tss.h"
 #include "resample.h"
 #include "peakpick.h"
 #include "biquad.h"
 #include "filter.h"
 #include "pitchdetection.h"
-#include "pitchmcomb.h"
-#include "pitchyin.h"
-#include "pitchyinfft.h"
-#include "pitchschmitt.h"
-#include "pitchfcomb.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 "filterbank.h"

diff --git a/src/filterbank.h b/src/filterbank.h
index feed08d35a823b0d3b476c62f05c5be86bfe143e..84c5ab6a8d130719c1dda8300bd657e0f9b15ecc 100644 (file)
--- a/src/filterbank.h
+++ b/src/filterbank.h
@@ -32,6 +32,7 @@
 extern "C" {
 #endif
 
+/** filterbank object */
 typedef struct aubio_filterbank_t_ aubio_filterbank_t;
 
 /** create filterbank object

diff --git a/src/onset.c b/src/onset.c
index 172a9e50c4b249847ddacad8c7eab753d73f491d..26445bd9de2c9730c2d562500f25ecbd189d6575 100644 (file)
--- a/src/onset.c
+++ b/src/onset.c
@@ -19,7 +19,7 @@
 
 #include "aubio_priv.h"
 #include "sample.h"
-#include "onsetdetection.h"
+#include "onset/detection.h"
 #include "phasevoc.h"
 #include "peakpick.h"
 #include "mathutils.h"

diff --git a/src/onsetdetection.c b/src/onset/onsetdetection.c
similarity index 99%
rename from src/onsetdetection.c
rename to src/onset/onsetdetection.c
index b6ca035500dc7e2e8c205709f405be9abd8fe6e8..2e4b1baeccab8dab1d00f5fa9e4d738223aa644d 100644 (file)
--- a/src/onsetdetection.c
+++ b/src/onset/onsetdetection.c
@@ -22,7 +22,7 @@
 #include "fft.h"
 #include "mathutils.h"
 #include "hist.h"
-#include "onsetdetection.h"
+#include "onset/onsetdetection.h"
 
 
 /** structure to store object state */

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

diff --git a/src/pitchfcomb.c b/src/pitch/pitchfcomb.c
similarity index 99%
rename from src/pitchfcomb.c
rename to src/pitch/pitchfcomb.c
index c33b4e75a3f51cac4cee819cbef927631423a062..e894b2bc8cc7a7eccdc2a74fbfdcff1bebb921cc 100644 (file)
--- a/src/pitchfcomb.c
+++ b/src/pitch/pitchfcomb.c
@@ -21,7 +21,7 @@
 #include "sample.h"
 #include "mathutils.h"
 #include "fft.h"
-#include "pitchfcomb.h"
+#include "pitch/pitchfcomb.h"
 
 #define MAX_PEAKS 8
 

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

diff --git a/src/pitchmcomb.c b/src/pitch/pitchmcomb.c
similarity index 99%
rename from src/pitchmcomb.c
rename to src/pitch/pitchmcomb.c
index 201200258e73de920461c13bee05bade7445484c..1d07c6fa1339136331b2a10ddeee41c965b5d20c 100644 (file)
--- a/src/pitchmcomb.c
+++ b/src/pitch/pitchmcomb.c
@@ -20,7 +20,7 @@
 #include "aubio_priv.h"
 #include "sample.h"
 #include "mathutils.h"
-#include "pitchmcomb.h"
+#include "pitch/pitchmcomb.h"
 
 #define CAND_SWAP(a,b) { register aubio_spectralcandidate_t *t=(a);(a)=(b);(b)=t; }
 

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

diff --git a/src/pitchschmitt.c b/src/pitch/pitchschmitt.c
similarity index 99%
rename from src/pitchschmitt.c
rename to src/pitch/pitchschmitt.c
index 0e356065a6802a1c732341416a40d93511149909..ceabd78b1a156eab77421b0482ef4fede150971a 100644 (file)
--- a/src/pitchschmitt.c
+++ b/src/pitch/pitchschmitt.c
@@ -19,7 +19,7 @@
 
 #include "aubio_priv.h"
 #include "sample.h"
-#include "pitchschmitt.h"
+#include "pitch/pitchschmitt.h"
 
 smpl_t aubio_schmittS16LE (aubio_pitchschmitt_t *p, uint_t nframes, signed short int *indata);
 

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

diff --git a/src/pitchyin.c b/src/pitch/pitchyin.c
similarity index 99%
rename from src/pitchyin.c
rename to src/pitch/pitchyin.c
index 01636079d5a4460638c7ae139d4bcab9ef001960..a77baef252fdf04d43f26d421ad4e7978c805ccf 100644 (file)
--- a/src/pitchyin.c
+++ b/src/pitch/pitchyin.c
@@ -28,7 +28,7 @@
 #include "aubio_priv.h"
 #include "sample.h"
 #include "mathutils.h"
-#include "pitchyin.h"
+#include "pitch/pitchyin.h"
 
 /* outputs the difference function */
 void aubio_pitchyin_diff(fvec_t * input, fvec_t * yin){

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

diff --git a/src/pitchyinfft.c b/src/pitch/pitchyinfft.c
similarity index 99%
rename from src/pitchyinfft.c
rename to src/pitch/pitchyinfft.c
index 1a59609c2cc1acaa47ea33518167ec2c3e7f5415..e81b490c9492e16dac54fdb7424335f615ac622e 100644 (file)
--- a/src/pitchyinfft.c
+++ b/src/pitch/pitchyinfft.c
@@ -20,7 +20,7 @@
 #include "sample.h"
 #include "mathutils.h"
 #include "fft.h"
-#include "pitchyinfft.h"
+#include "pitch/pitchyinfft.h"
 
 /** pitch yinfft structure */
 struct _aubio_pitchyinfft_t {

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

diff --git a/src/pitchdetection.c b/src/pitchdetection.c
index 3e2c181f18e3ac71a7e255f2352be4d3f5e39f71..18cc89bc2ae678631007d2b2e1c3769e0f3b718c 100644 (file)
--- a/src/pitchdetection.c
+++ b/src/pitchdetection.c
@@ -21,11 +21,11 @@
 #include "phasevoc.h"
 #include "mathutils.h"
 #include "filter.h"
-#include "pitchmcomb.h"
-#include "pitchyin.h"
-#include "pitchfcomb.h"
-#include "pitchschmitt.h"
-#include "pitchyinfft.h"
+#include "pitch/pitchmcomb.h"
+#include "pitch/pitchyin.h"
+#include "pitch/pitchfcomb.h"
+#include "pitch/pitchschmitt.h"
+#include "pitch/pitchyinfft.h"
 #include "pitchdetection.h"
 
 typedef smpl_t (*aubio_pitchdetection_func_t)

diff --git a/src/tempo.c b/src/tempo.c
index 4eb56f268de419eb3b3f8dd10de153e91e24860b..18d9a549abb464ce47b1bbc16c9ab0d629d75eda 100644 (file)
--- a/src/tempo.c
+++ b/src/tempo.c
@@ -19,7 +19,7 @@
 
 #include "aubio_priv.h"
 #include "sample.h"
-#include "onsetdetection.h"
+#include "onset/detection.h"
 #include "beattracking.h"
 #include "phasevoc.h"
 #include "peakpick.h"