Changeset 31907fd for src/tempo


Ignore:
Timestamp:
Nov 3, 2009, 6:23:04 PM (10 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master, pitchshift, sampler, timestretch, yinfft+
Children:
bf2e7a7
Parents:
bafe71d
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/tempo/tempo.c

    rbafe71d r31907fd  
    2222#include "fvec.h"
    2323#include "cvec.h"
    24 #include "onset/onsetdetection.h"
     24#include "spectral/specdesc.h"
    2525#include "tempo/beattracking.h"
    2626#include "spectral/phasevoc.h"
     
    3131/* structure to store object state */
    3232struct _aubio_tempo_t {
    33   aubio_onsetdetection_t * od;   /** onset detection */
     33  aubio_specdesc_t * od;   /** onset detection */
    3434  aubio_pvoc_t * pv;             /** phase vocoder */
    3535  aubio_peakpicker_t * pp;       /** peak picker */
     
    5656  uint_t step   = o->step;
    5757  aubio_pvoc_do (o->pv, input, o->fftgrain);
    58   aubio_onsetdetection_do (o->od, o->fftgrain, o->of);
     58  aubio_specdesc_do (o->od, o->fftgrain, o->of);
    5959  /*if (usedoubled) {
    60     aubio_onsetdetection_do(o2,fftgrain, onset2);
     60    aubio_specdesc_do(o2,fftgrain, onset2);
    6161    onset->data[0][0] *= onset2->data[0][0];
    6262  }*/
     
    121121  o->pp       = new_aubio_peakpicker(channels);
    122122  aubio_peakpicker_set_threshold (o->pp, o->threshold);
    123   o->od       = new_aubio_onsetdetection(onset_mode,buf_size,channels);
     123  o->od       = new_aubio_specdesc(onset_mode,buf_size,channels);
    124124  o->of       = new_fvec(1, channels);
    125125  o->bt       = new_aubio_beattracking(o->winlen,channels);
     
    127127  o->peek     = new_fvec(3, channels);
    128128  /*if (usedoubled)    {
    129     o2 = new_aubio_onsetdetection(type_onset2,buffer_size,channels);
     129    o2 = new_aubio_specdesc(type_onset2,buffer_size,channels);
    130130    onset2 = new_fvec(1 , channels);
    131131  }*/
     
    143143void del_aubio_tempo (aubio_tempo_t *o)
    144144{
    145   del_aubio_onsetdetection(o->od);
     145  del_aubio_specdesc(o->od);
    146146  del_aubio_beattracking(o->bt);
    147147  del_aubio_peakpicker(o->pp);
Note: See TracChangeset for help on using the changeset viewer.