Changeset dddf1f5 for src/tempo

Timestamp:

Nov 29, 2007, 5:34:18 PM (17 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

212da72

Parents:

66a1b955 (diff), 6c7d49b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with main branch

Location:

src/tempo

Files:

• beattracking.c (moved) (moved from src/beattracking.c) (1 diff)
• beattracking.h (moved) (moved from src/beattracking.h)
• tempo.c (moved) (moved from src/tempo.c) (1 diff)
• tempo.h (moved) (moved from src/tempo.h)

src/tempo/beattracking.c

@@ -19 +19 @@
 
 #include "aubio_priv.h"
-#include "sample.h"
+#include "fvec.h"
 #include "mathutils.h"
-#include "beattracking.h"
+#include "tempo/beattracking.h"
 
 uint_t fvec_gettimesig(smpl_t * acf, uint_t acflen, uint_t gp);

src/tempo/tempo.c

@@ -19 +19 @@
 
 #include "aubio_priv.h"
-#include "sample.h"
-#include "onsetdetection.h"
-#include "beattracking.h"
-#include "phasevoc.h"
-#include "peakpick.h"
+#include "fvec.h"
+#include "cvec.h"
+#include "onset/onsetdetection.h"
+#include "tempo/beattracking.h"
+#include "spectral/phasevoc.h"
+#include "onset/peakpick.h"
 #include "mathutils.h"
-#include "tempo.h"
+#include "tempo/tempo.h"
 
 /* structure to store object state */