Changeset c1656cf


Ignore:
Timestamp:
Oct 25, 2007, 4:02:06 AM (13 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:
7873363
Parents:
14aebce (diff), 97525e4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge from main branch

Files:
1 added
8 edited
1 moved

Legend:

Unmodified
Added
Removed
  • configure.ac

    r14aebce rc1656cf  
    2525dnl Check for programs
    2626AC_PROG_CC
     27AM_PROG_CC_C_O dnl compiling with per-target flag
    2728if test "$ac_cv_prog_cc" = "no" ; then
    2829   AC_MSG_ERROR([*** No C compiler found !])
  • examples/tests/test-beattracking.c

    r14aebce rc1656cf  
    1313        uint_t i = 0;
    1414
    15         smpl_t curtempo;
     15        smpl_t curtempo, curtempoconf;
    1616
    1717        while (i < 10) {
     
    1919          curtempo = aubio_beattracking_get_bpm(tempo);
    2020          if (curtempo != 0.) {
     21            fprintf(stdout,"%f\n",curtempo);
     22            return 1;
     23          }
     24          curtempoconf = aubio_beattracking_get_confidence(tempo);
     25          if (curtempoconf != 0.) {
    2126            fprintf(stdout,"%f\n",curtempo);
    2227            return 1;
  • examples/tests/test-tempo.c

    r14aebce rc1656cf  
    1010        uint_t i = 0;
    1111
    12         smpl_t curtempo;
     12        smpl_t curtempo, curtempoconf;
    1313
    1414        while (i < 1000) {
     
    1717          if (curtempo != 0.) {
    1818            fprintf(stdout,"%f\n",curtempo);
     19            return 1;
     20          }
     21          curtempoconf = aubio_beattracking_get_confidence(o);
     22          if (curtempoconf != 0.) {
     23            fprintf(stdout,"%f\n",curtempo);
     24            return 1;
    1925          }
    2026          i++;
  • src/beattracking.c

    r14aebce rc1656cf  
    461461        }
    462462}
     463
     464smpl_t aubio_beattracking_get_confidence(aubio_beattracking_t * bt) {
     465        if (bt->gp) return vec_max(bt->acfout);
     466        else return 0.;
     467}
  • src/beattracking.h

    r14aebce rc1656cf  
    6969*/
    7070smpl_t aubio_beattracking_get_bpm(aubio_beattracking_t * bt);
     71/** get current tempo confidence
     72
     73  \param bt beat tracking object
     74
     75  Returns the confidence with which the tempo has been observed, 0 if no
     76  consistent value is found.
     77
     78*/
     79smpl_t aubio_beattracking_get_confidence(aubio_beattracking_t * bt);
    7180/** delete beat tracking object
    7281
  • src/tempo.c

    r14aebce rc1656cf  
    128128}
    129129
     130smpl_t aubio_tempo_get_confidence(aubio_tempo_t *o) {
     131  return aubio_beattracking_get_confidence(o->bt);
     132}
     133
    130134void del_aubio_tempo (aubio_tempo_t *o)
    131135{
  • src/tempo.h

    r14aebce rc1656cf  
    5959smpl_t aubio_tempo_get_bpm(aubio_tempo_t * bt);
    6060
     61/** get current tempo confidence
     62
     63  \param bt beat tracking object
     64
     65  Returns the confidence with which the tempo has been observed, 0 if no
     66  consistent value is found.
     67
     68*/
     69smpl_t aubio_tempo_get_confidence(aubio_tempo_t * bt);
     70
    6171/** delete tempo detection object */
    6272void del_aubio_tempo(aubio_tempo_t * o);
  • swig/aubio.i

    r14aebce rc1656cf  
    271271void aubio_beattracking_do(aubio_beattracking_t * bt, fvec_t * dfframes, fvec_t * out);
    272272void del_aubio_beattracking(aubio_beattracking_t * p);
     273smpl_t aubio_beattracking_get_bpm(aubio_beattracking_t * p);
     274smpl_t aubio_beattracking_get_confidence(aubio_beattracking_t * p);
    273275
    274276
Note: See TracChangeset for help on using the changeset viewer.