Changeset 01b8fcc


Ignore:
Timestamp:
Oct 7, 2009, 10:58:25 PM (15 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:
0ce97483
Parents:
cb158ab
Message:

src/onset: rename aubio_onsetdetection to aubio_onsetdetection_do

Files:
10 edited

Legend:

Unmodified
Added
Removed

  • examples/aubionotes.c

    rcb158ab r01b8fcc  
    3939      /* block loop */
    4040      aubio_pvoc_do (pv,ibuf, fftgrain);
    41       aubio_onsetdetection(o,fftgrain, onset);
     41      aubio_onsetdetection_do(o,fftgrain, onset);
    4242      if (usedoubled) {
    43         aubio_onsetdetection(o2,fftgrain, onset2);
     43        aubio_onsetdetection_do(o2,fftgrain, onset2);
    4444        onset->data[0][0] *= onset2->data[0][0];
    4545      }

  • examples/aubioonset.c

    rcb158ab r01b8fcc  
    3939      /* block loop */
    4040      aubio_pvoc_do (pv,ibuf, fftgrain);
    41       aubio_onsetdetection(o,fftgrain, onset);
     41      aubio_onsetdetection_do (o,fftgrain, onset);
    4242      if (usedoubled) {
    43         aubio_onsetdetection(o2,fftgrain, onset2);
     43        aubio_onsetdetection_do (o2,fftgrain, onset2);
    4444        onset->data[0][0] *= onset2->data[0][0];
    4545      }

  • plugins/puredata/aubioonset~.c

    rcb158ab r01b8fcc  
    4747                        /* block loop */
    4848                        aubio_pvoc_do (x->pv,x->vec, x->fftgrain);
    49                         aubio_onsetdetection(x->o,x->fftgrain, x->onset);
     49                        aubio_onsetdetection_do (x->o,x->fftgrain, x->onset);
    5050                        isonset = aubio_peakpick_pimrt(x->onset,x->parms);
    5151                        if (isonset) {

  • python/aubio/aubioclass.py

    rcb158ab r01b8fcc  
    7373        self.od = new_aubio_onsetdetection(type,buf,chan)
    7474    def do(self,tc,tf):
    75         aubio_onsetdetection(self.od,tc(),tf())
     75        aubio_onsetdetection_do(self.od,tc(),tf())
    7676    def __del__(self):
    7777        del_aubio_onsetdetection(self.od)

  • src/onset/onset.c

    rcb158ab r01b8fcc  
    4646  uint_t wasonset = o->wasonset;
    4747  aubio_pvoc_do (o->pv,input, o->fftgrain);
    48   aubio_onsetdetection(o->od,o->fftgrain, o->of);
     48  aubio_onsetdetection_do (o->od,o->fftgrain, o->of);
    4949  /*if (usedoubled) {
    50     aubio_onsetdetection(o2,fftgrain, onset2);
     50    aubio_onsetdetection_do (o2,fftgrain, onset2);
    5151    onset->data[0][0] *= onset2->data[0][0];
    5252  }*/

  • src/onset/onsetdetection.c

    rcb158ab r01b8fcc  
    296296/* Generic function pointing to the choosen one */
    297297void
    298 aubio_onsetdetection(aubio_onsetdetection_t *o, cvec_t * fftgrain,
     298aubio_onsetdetection_do (aubio_onsetdetection_t *o, cvec_t * fftgrain,
    299299    fvec_t * onset) {
    300300  o->funcpointer(o,fftgrain,onset);

  • src/onset/onsetdetection.h

    rcb158ab r01b8fcc  
    6262
    6363*/
    64 void aubio_onsetdetection(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset);
     64void aubio_onsetdetection_do (aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset);
    6565/** creation of an onset detection object
    6666

  • src/tempo/tempo.c

    rcb158ab r01b8fcc  
    5252  uint_t step   = o->step;
    5353  aubio_pvoc_do (o->pv, input, o->fftgrain);
    54   aubio_onsetdetection(o->od, o->fftgrain, o->of);
     54  aubio_onsetdetection_do (o->od, o->fftgrain, o->of);
    5555  /*if (usedoubled) {
    56     aubio_onsetdetection(o2,fftgrain, onset2);
     56    aubio_onsetdetection_do(o2,fftgrain, onset2);
    5757    onset->data[0][0] *= onset2->data[0][0];
    5858  }*/

  • swig/aubio.i

    rcb158ab r01b8fcc  
    199199} aubio_onsetdetection_type;
    200200aubio_onsetdetection_t * new_aubio_onsetdetection(aubio_onsetdetection_type type, uint_t size, uint_t channels);
    201 void aubio_onsetdetection(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset);
     201void aubio_onsetdetection_do (aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset);
    202202void del_aubio_onsetdetection(aubio_onsetdetection_t *o);
    203 
    204 /* should these still be exposed ? */
    205 void aubio_onsetdetection_energy  (aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset);
    206 void aubio_onsetdetection_hfc     (aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset);
    207 void aubio_onsetdetection_complex (aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset);
    208 void aubio_onsetdetection_phase   (aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset);
    209 void aubio_onsetdetection_specdiff(aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset);
    210 void aubio_onsetdetection_kl      (aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset);
    211 void aubio_onsetdetection_mkl     (aubio_onsetdetection_t *o, cvec_t * fftgrain, fvec_t * onset);
    212203
    213204/* pvoc */

  • tests/src/test-onsetdetection.c

    rcb158ab r01b8fcc  
    22#include <aubio.h>
    33
    4 int main(){
    5         /* allocate some memory */
    6         uint_t win_s      = 1024;                       /* window size */
    7         uint_t channels   = 1;                          /* number of channel */
    8         cvec_t * in       = new_cvec (win_s, channels); /* input buffer */
    9         fvec_t * out      = new_fvec (1, channels);     /* input buffer */
     4int
     5main ()
     6{
     7  uint_t win_s = 1024;          /* window size */
     8  uint_t channels = 1;          /* number of channel */
     9  cvec_t *in = new_cvec (win_s, channels);      /* input buffer */
     10  fvec_t *out = new_fvec (1, channels); /* input buffer */
     11
     12  aubio_onsetdetection_t *o;
    1013 
    11         /* allocate fft and other memory space */
    12         aubio_onsetdetection_t * o =
    13           new_aubio_onsetdetection(aubio_onset_energy, win_s, channels);
    14         aubio_onsetdetection(o,in,out);
    15         aubio_onsetdetection_energy(o,in,out);
    16         del_aubio_onsetdetection(o);
     14  o = new_aubio_onsetdetection (aubio_onset_energy, win_s, channels);
     15  aubio_onsetdetection_do (o, in, out);
     16  del_aubio_onsetdetection (o);
    1717
    18         o = new_aubio_onsetdetection(aubio_onset_specdiff, win_s, channels);
    19         aubio_onsetdetection(o,in,out);
    20         aubio_onsetdetection_specdiff(o,in,out);
    21         del_aubio_onsetdetection(o);
     18  o = new_aubio_onsetdetection (aubio_onset_specdiff, win_s, channels);
     19  aubio_onsetdetection_do (o, in, out);
     20  del_aubio_onsetdetection (o);
    2221
    23         o = new_aubio_onsetdetection(aubio_onset_hfc, win_s, channels);
    24         aubio_onsetdetection(o,in,out);
    25         aubio_onsetdetection_hfc(o,in,out);
    26         del_aubio_onsetdetection(o);
     22  o = new_aubio_onsetdetection (aubio_onset_hfc, win_s, channels);
     23  aubio_onsetdetection_do (o, in, out);
     24  del_aubio_onsetdetection (o);
    2725
    28         o = new_aubio_onsetdetection(aubio_onset_complex, win_s, channels);
    29         aubio_onsetdetection(o,in,out);
    30         aubio_onsetdetection_complex(o,in,out);
    31         del_aubio_onsetdetection(o);
     26  o = new_aubio_onsetdetection (aubio_onset_complex, win_s, channels);
     27  aubio_onsetdetection_do (o, in, out);
     28  del_aubio_onsetdetection (o);
    3229
    33         o = new_aubio_onsetdetection(aubio_onset_phase, win_s, channels);
    34         aubio_onsetdetection(o,in,out);
    35         aubio_onsetdetection_phase(o,in,out);
    36         del_aubio_onsetdetection(o);
     30  o = new_aubio_onsetdetection (aubio_onset_phase, win_s, channels);
     31  aubio_onsetdetection_do (o, in, out);
     32  del_aubio_onsetdetection (o);
    3733
    38         o = new_aubio_onsetdetection(aubio_onset_kl, win_s, channels);
    39         aubio_onsetdetection(o,in,out);
    40         aubio_onsetdetection_kl(o,in,out);
    41         del_aubio_onsetdetection(o);
     34  o = new_aubio_onsetdetection (aubio_onset_kl, win_s, channels);
     35  aubio_onsetdetection_do (o, in, out);
     36  del_aubio_onsetdetection (o);
    4237
    43         o = new_aubio_onsetdetection(aubio_onset_mkl, win_s, channels);
    44         aubio_onsetdetection(o,in,out);
    45         aubio_onsetdetection_mkl(o,in,out);
    46         del_aubio_onsetdetection(o);
     38  o = new_aubio_onsetdetection (aubio_onset_mkl, win_s, channels);
     39  aubio_onsetdetection_do (o, in, out);
     40  del_aubio_onsetdetection (o);
    4741
    48         del_cvec(in);
    49         del_fvec(out);
    50         aubio_cleanup();
     42  del_cvec (in);
     43  del_fvec (out);
     44  aubio_cleanup ();
    5145
    52         return 0;
     46  return 0;
    5347}
    54 
Note: See TracChangeset for help on using the changeset viewer.