Changeset 31907fd for src/onset

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

Location:

src/onset

Files:

• onset.c (modified) (5 diffs)
• onset.h (modified) (1 diff)

src/onset/onset.c

@@ -22 +22 @@
 #include "fvec.h"
 #include "cvec.h"
-#include "onset/onsetdetection.h"
+#include "spectral/specdesc.h"
 #include "spectral/phasevoc.h"
 #include "onset/peakpick.h"
@@ -31 +31 @@
 struct _aubio_onset_t {
   aubio_pvoc_t * pv;            /**< phase vocoder */
-  aubio_onsetdetection_t * od;  /**< onset detection */ 
+  aubio_specdesc_t * od;  /**< onset detection */ 
   aubio_peakpicker_t * pp;      /**< peak picker */
   cvec_t * fftgrain;            /**< phase vocoder output */
@@ -49 +49 @@
   uint_t i;
   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];
   }*/
@@ -109 +109 @@
   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->fftgrain = new_cvec(buf_size,channels);
   o->of = new_fvec(1, channels);
   /*if (usedoubled)    {
-    o2 = new_aubio_onsetdetection(onset_type2,buffer_size,channels);
+    o2 = new_aubio_specdesc(onset_type2,buffer_size,channels);
     onset2 = new_fvec(1 , channels);
   }*/
@@ -121 +121 @@
 void del_aubio_onset (aubio_onset_t *o)
 {
-  del_aubio_onsetdetection(o->od);
+  del_aubio_specdesc(o->od);
   del_aubio_peakpicker(o->pp);
   del_aubio_pvoc(o->pv);

src/onset/onset.h

@@ -47 +47 @@
 /** create onset detection object
   
-  \param onset_mode onset detection type as specified in onsetdetection.h
+  \param onset_mode onset detection type as specified in specdesc.h
   \param buf_size buffer size for phase vocoder
   \param hop_size hop size for phase vocoder