Changeset 1294862


Ignore:
Timestamp:
Oct 7, 2009, 7:33:51 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:
e5e693e
Parents:
1b88289
Message:

src/pitch/: change all _detect prototypes to _do

Files:
13 edited

Legend:

Unmodified
Added
Removed

  • examples/aubionotes.c

    r1b88289 r1294862  
    4646      isonset = aubio_peakpicker_do(parms, onset);
    4747     
    48       pitch = aubio_pitchdetection(pitchdet,ibuf);
     48      pitch = aubio_pitchdetection_do (pitchdet,ibuf);
    4949      if(median){
    5050              note_append(note_buffer, pitch);

  • python/aubio/aubioclass.py

    r1b88289 r1294862  
    135135    def __call__(self,myvec):
    136136        #self.filt(myvec)
    137         return aubio_pitchdetection(self.pitchp,myvec())
     137        return aubio_pitchdetection_do(self.pitchp,myvec())
    138138
    139139class filter:

  • src/pitch/pitchdetection.c

    r1b88289 r1294862  
    196196}
    197197
    198 smpl_t aubio_pitchdetection(aubio_pitchdetection_t *p, fvec_t * ibuf) {
     198smpl_t aubio_pitchdetection_do (aubio_pitchdetection_t *p, fvec_t * ibuf) {
    199199  return p->freqconv(p->callback(p,ibuf),p->srate,p->bufsize);
    200200}
    … …  
    204204  aubio_filter_do(p->filter,ibuf);
    205205  aubio_pvoc_do(p->pv,ibuf,p->fftgrain);
    206   pitch = aubio_pitchmcomb_detect(p->mcomb,p->fftgrain);
     206  pitch = aubio_pitchmcomb_do(p->mcomb,p->fftgrain);
    207207  /** \bug should move the >0 check within aubio_bintofreq */
    208208  if (pitch>0.) {
    … …  
    230230  smpl_t pitch = 0.;
    231231  aubio_pitchdetection_slideblock(p,ibuf);
    232   pitch = aubio_pitchyinfft_detect(p->yinfft,p->buf,p->yinthres);
     232  pitch = aubio_pitchyinfft_do(p->yinfft,p->buf,p->yinthres);
    233233  if (pitch>0) {
    234234    pitch = p->srate/(pitch+0.);
    … …  
    241241smpl_t aubio_pitchdetection_fcomb(aubio_pitchdetection_t *p, fvec_t *ibuf){
    242242  aubio_pitchdetection_slideblock(p,ibuf);
    243   return aubio_pitchfcomb_detect(p->fcomb,p->buf);
     243  return aubio_pitchfcomb_do(p->fcomb,p->buf);
    244244}
    245245
    246246smpl_t aubio_pitchdetection_schmitt(aubio_pitchdetection_t *p, fvec_t *ibuf){
    247247  aubio_pitchdetection_slideblock(p,ibuf);
    248   return aubio_pitchschmitt_detect(p->schmitt,p->buf);
    249 }
     248  return aubio_pitchschmitt_do(p->schmitt,p->buf);
     249}

  • src/pitch/pitchdetection.h

    r1b88289 r1294862  
    5959
    6060*/
    61 smpl_t aubio_pitchdetection(aubio_pitchdetection_t * p, fvec_t * ibuf);
     61smpl_t aubio_pitchdetection_do (aubio_pitchdetection_t * p, fvec_t * ibuf);
    6262
    6363/** change yin or yinfft tolerance threshold

  • src/pitch/pitchfcomb.c

    r1b88289 r1294862  
    5959
    6060/* input must be stepsize long */
    61 smpl_t aubio_pitchfcomb_detect (aubio_pitchfcomb_t * p, fvec_t * input)
     61smpl_t aubio_pitchfcomb_do (aubio_pitchfcomb_t * p, fvec_t * input)
    6262{
    6363  uint_t k, l, maxharm = 0;

  • src/pitch/pitchfcomb.h

    r1b88289 r1294862  
    4848 
    4949*/
    50 smpl_t aubio_pitchfcomb_detect (aubio_pitchfcomb_t *p, fvec_t * input);
     50smpl_t aubio_pitchfcomb_do (aubio_pitchfcomb_t *p, fvec_t * input);
    5151/** creation of the pitch detection object
    5252 

  • src/pitch/pitchmcomb.c

    r1b88289 r1294862  
    9090
    9191
    92 smpl_t aubio_pitchmcomb_detect(aubio_pitchmcomb_t * p, cvec_t * fftgrain) {
     92smpl_t aubio_pitchmcomb_do (aubio_pitchmcomb_t * p, cvec_t * fftgrain) {
    9393  uint_t i=0,j;
    9494  smpl_t instfreq;

  • src/pitch/pitchmcomb.h

    r1b88289 r1294862  
    4949 
    5050*/
    51 smpl_t aubio_pitchmcomb_detect(aubio_pitchmcomb_t * p, cvec_t * fftgrain);
     51smpl_t aubio_pitchmcomb_do (aubio_pitchmcomb_t * p, cvec_t * fftgrain);
    5252/** select the best candidates */
    5353uint_t aubio_pitch_cands(aubio_pitchmcomb_t * p, cvec_t * fftgrain, smpl_t * cands);

  • src/pitch/pitchschmitt.c

    r1b88289 r1294862  
    4343}
    4444
    45 smpl_t aubio_pitchschmitt_detect (aubio_pitchschmitt_t *p, fvec_t * input)
     45smpl_t aubio_pitchschmitt_do (aubio_pitchschmitt_t *p, fvec_t * input)
    4646{
    4747  uint_t i;

  • src/pitch/pitchschmitt.h

    r1b88289 r1294862  
    4848 
    4949*/
    50 smpl_t aubio_pitchschmitt_detect (aubio_pitchschmitt_t *p, fvec_t * input);
     50smpl_t aubio_pitchschmitt_do (aubio_pitchschmitt_t *p, fvec_t * input);
    5151/** creation of the pitch detection object
    5252 

  • src/pitch/pitchyinfft.c

    r1b88289 r1294862  
    8888}
    8989
    90 smpl_t aubio_pitchyinfft_detect(aubio_pitchyinfft_t * p, fvec_t * input, smpl_t tol) {
     90smpl_t aubio_pitchyinfft_do (aubio_pitchyinfft_t * p, fvec_t * input, smpl_t tol) {
    9191  uint_t tau, l = 0;
    9292  uint_t halfperiod;

  • src/pitch/pitchyinfft.h

    r1b88289 r1294862  
    4949 
    5050*/
    51 smpl_t aubio_pitchyinfft_detect (aubio_pitchyinfft_t *p, fvec_t * input, smpl_t tol);
     51smpl_t aubio_pitchyinfft_do (aubio_pitchyinfft_t *p, fvec_t * input, smpl_t tol);
    5252/** creation of the pitch detection object
    5353 

  • swig/aubio.i

    r1b88289 r1294862  
    163163/* filterbank */
    164164aubio_filterbank_t * new_aubio_filterbank(uint_t win_s, uint_t channels);
    165 void aubio_filterbank_set_mel_coeffs(aubio_filterbank_t *fb, fvec_t *freqs, uint_t samplerate);
     165void aubio_filterbank_set_mel_coeffs(aubio_filterbank_t *fb, uint_t samplerate, fvec_t *freqs);
    166166void aubio_filterbank_set_mel_coeffs_slaney(aubio_filterbank_t *fb, uint_t samplerate);
    167167void del_aubio_filterbank(aubio_filterbank_t * fb);
    … …  
    233233} aubio_pitchdetection_mode;
    234234
    235 smpl_t aubio_pitchdetection(aubio_pitchdetection_t * p, fvec_t * ibuf);
     235smpl_t aubio_pitchdetection_do (aubio_pitchdetection_t * p, fvec_t * ibuf);
    236236
    237237void aubio_pitchdetection_set_yinthresh(aubio_pitchdetection_t *p, smpl_t thres);
    … …  
    249249/* pitch mcomb */
    250250aubio_pitchmcomb_t * new_aubio_pitchmcomb(uint_t bufsize, uint_t hopsize, uint_t channels, uint_t samplerate);
    251 smpl_t aubio_pitchmcomb_detect(aubio_pitchmcomb_t * p, cvec_t * fftgrain);
     251smpl_t aubio_pitchmcomb_do (aubio_pitchmcomb_t * p, cvec_t * fftgrain);
    252252uint_t aubio_pitch_cands(aubio_pitchmcomb_t * p, cvec_t * fftgrain, smpl_t * cands);
    253253void del_aubio_pitchmcomb (aubio_pitchmcomb_t *p);
    … …  
    261261/* pitch schmitt */
    262262aubio_pitchschmitt_t * new_aubio_pitchschmitt (uint_t size, uint_t samplerate);
    263 smpl_t aubio_pitchschmitt_detect (aubio_pitchschmitt_t *p, fvec_t * input);
     263smpl_t aubio_pitchschmitt_do (aubio_pitchschmitt_t *p, fvec_t * input);
    264264void del_aubio_pitchschmitt (aubio_pitchschmitt_t *p);
    265265
    266266/* pitch fcomb */
    267267aubio_pitchfcomb_t * new_aubio_pitchfcomb (uint_t size, uint_t hopsize, uint_t samplerate);
    268 smpl_t aubio_pitchfcomb_detect (aubio_pitchfcomb_t *p, fvec_t * input);
     268smpl_t aubio_pitchfcomb_do (aubio_pitchfcomb_t *p, fvec_t * input);
    269269void del_aubio_pitchfcomb (aubio_pitchfcomb_t *p);
    270270
Note: See TracChangeset for help on using the changeset viewer.