Changeset 31907fd for src/tempo

Timestamp:

Nov 3, 2009, 6:23:04 PM (14 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:

bf2e7a7

Parents:

bafe71d

Message:

src/spectral/specdesc.{c,h}: rename aubio_onsetdetection to aubio_specdesc

File:

• src/tempo/tempo.c (modified) (6 diffs)

src/tempo/tempo.c

@@ -22 +22 @@
 #include "fvec.h"
 #include "cvec.h"
-#include "onset/onsetdetection.h"
+#include "spectral/specdesc.h"
 #include "tempo/beattracking.h"
 #include "spectral/phasevoc.h"
@@ -31 +31 @@
 /* structure to store object state */
 struct _aubio_tempo_t {
-  aubio_onsetdetection_t * od;   /** onset detection */
+  aubio_specdesc_t * od;   /** onset detection */
   aubio_pvoc_t * pv;             /** phase vocoder */
   aubio_peakpicker_t * pp;       /** peak picker */
@@ -56 +56 @@
   uint_t step   = o->step;
   aubio_pvoc_do (o->pv, input, o->fftgrain);
-  aubio_onsetdetection_do (o->od, o->fftgrain, o->of);
+  aubio_specdesc_do (o->od, o->fftgrain, o->of);
   /*if (usedoubled) {
-    aubio_onsetdetection_do(o2,fftgrain, onset2);
+    aubio_specdesc_do(o2,fftgrain, onset2);
     onset->data[0][0] *= onset2->data[0][0];
   }*/
@@ -121 +121 @@
   o->pp       = new_aubio_peakpicker(channels);
   aubio_peakpicker_set_threshold (o->pp, o->threshold);
-  o->od       = new_aubio_onsetdetection(onset_mode,buf_size,channels);
+  o->od       = new_aubio_specdesc(onset_mode,buf_size,channels);
   o->of       = new_fvec(1, channels);
   o->bt       = new_aubio_beattracking(o->winlen,channels);
@@ -127 +127 @@
   o->peek     = new_fvec(3, channels);
   /*if (usedoubled)    {
-    o2 = new_aubio_onsetdetection(type_onset2,buffer_size,channels);
+    o2 = new_aubio_specdesc(type_onset2,buffer_size,channels);
     onset2 = new_fvec(1 , channels);
   }*/
@@ -143 +143 @@
 void del_aubio_tempo (aubio_tempo_t *o)
 {
-  del_aubio_onsetdetection(o->od);
+  del_aubio_specdesc(o->od);
   del_aubio_beattracking(o->bt);
   del_aubio_peakpicker(o->pp);