From bcf38fe01822c610831591851df8abd76bfaacf7 Mon Sep 17 00:00:00 2001
From: Paul Brossier <piem@piem.org>
Date: Sat, 24 Nov 2007 21:08:04 +0100
Subject: [PATCH] src/: move tempo files to src/tempo, continue moving pitch
 and onset files

---
 src/Makefile.am                  | 36 ++++++++++++++++----------------
 src/aubio.h                      | 12 +++++------
 src/{ => onset}/onset.c          |  2 +-
 src/{ => onset}/onset.h          |  0
 src/{ => onset}/peakpick.c       |  0
 src/{ => onset}/peakpick.h       |  0
 src/{ => pitch}/pitchdetection.c |  0
 src/{ => pitch}/pitchdetection.h |  0
 src/{ => tempo}/beattracking.c   |  0
 src/{ => tempo}/beattracking.h   |  0
 src/{ => tempo}/tempo.c          |  6 +++---
 src/{ => tempo}/tempo.h          |  0
 12 files changed, 28 insertions(+), 28 deletions(-)
 rename src/{ => onset}/onset.c (99%)
 rename src/{ => onset}/onset.h (100%)
 rename src/{ => onset}/peakpick.c (100%)
 rename src/{ => onset}/peakpick.h (100%)
 rename src/{ => pitch}/pitchdetection.c (100%)
 rename src/{ => pitch}/pitchdetection.h (100%)
 rename src/{ => tempo}/beattracking.c (100%)
 rename src/{ => tempo}/beattracking.h (100%)
 rename src/{ => tempo}/tempo.c (98%)
 rename src/{ => tempo}/tempo.h (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 5e256613..f29dd3bd 100644
--- 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 c0a1acf2..73af8bbf 100644
--- 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 26445bd9..e4bc5dde 100644
--- 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 18d9a549..1794bae3 100644
--- 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
-- 
2.26.2