From 2d8cffabb484b5bee7d4d44c8f753d95ca841d03 Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Sat, 24 Nov 2007 20:47:55 +0100 Subject: [PATCH] move pitch methods to pitch/, onset detection functions to onset/ --- src/Makefile.am | 36 ++++++++++++++++---------------- src/aubio.h | 12 +++++------ src/filterbank.h | 1 + src/onset.c | 2 +- src/{ => onset}/onsetdetection.c | 2 +- src/{ => onset}/onsetdetection.h | 0 src/{ => pitch}/pitchfcomb.c | 2 +- src/{ => pitch}/pitchfcomb.h | 0 src/{ => pitch}/pitchmcomb.c | 2 +- src/{ => pitch}/pitchmcomb.h | 0 src/{ => pitch}/pitchschmitt.c | 2 +- src/{ => pitch}/pitchschmitt.h | 0 src/{ => pitch}/pitchyin.c | 2 +- src/{ => pitch}/pitchyin.h | 0 src/{ => pitch}/pitchyinfft.c | 2 +- src/{ => pitch}/pitchyinfft.h | 0 src/pitchdetection.c | 10 ++++----- src/tempo.c | 2 +- 18 files changed, 38 insertions(+), 37 deletions(-) rename src/{ => onset}/onsetdetection.c (99%) rename src/{ => onset}/onsetdetection.h (100%) rename src/{ => pitch}/pitchfcomb.c (99%) rename src/{ => pitch}/pitchfcomb.h (100%) rename src/{ => pitch}/pitchmcomb.c (99%) rename src/{ => pitch}/pitchmcomb.h (100%) rename src/{ => pitch}/pitchschmitt.c (99%) rename src/{ => pitch}/pitchschmitt.h (100%) rename src/{ => pitch}/pitchyin.c (99%) rename src/{ => pitch}/pitchyin.h (100%) rename src/{ => pitch}/pitchyinfft.c (99%) rename src/{ => pitch}/pitchyinfft.h (100%) diff --git a/src/Makefile.am b/src/Makefile.am index f13bb8d0..5e256613 100644 --- 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 af786446..c0a1acf2 100644 --- 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 feed08d3..84c5ab6a 100644 --- 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 172a9e50..26445bd9 100644 --- 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 b6ca0355..2e4b1bae 100644 --- 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 c33b4e75..e894b2bc 100644 --- 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 20120025..1d07c6fa 100644 --- 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 0e356065..ceabd78b 100644 --- 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 01636079..a77baef2 100644 --- 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 1a59609c..e81b490c 100644 --- 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 3e2c181f..18cc89bc 100644 --- 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 4eb56f26..18d9a549 100644 --- 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" -- 2.26.2