From: Paul Brossier <piem@altern.org>
Date: Sat, 22 Jul 2006 09:43:30 +0000 (+0000)
Subject: update aubiotrack to new tempo objects
X-Git-Tag: bzr2git~602
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fc5bc72c05d36fa09cbd98e18013f8ebc2afa91d;p=aubio.git

update aubiotrack to new tempo objects
update aubiotrack to new tempo objects
---

diff --git a/examples/aubiotrack.c b/examples/aubiotrack.c
index 3eda8f3d..6edcd919 100644
--- a/examples/aubiotrack.c
+++ b/examples/aubiotrack.c
@@ -16,24 +16,19 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <aubio.h>
 #include "utils.h"
-#include "beattracking.h"
 
 unsigned int pos          = 0;    /* frames%dspblocksize */
-unsigned int pos2         = 0;    /* frames%dspblocksize */
 uint_t usepitch           = 0;
-fvec_t * dfframe          = NULL;
 fvec_t * out              = NULL;
-aubio_beattracking_t * bt = NULL;
-uint_t winlen             = 512;
-uint_t step               = 0;
+aubio_tempo_t * bt        = NULL;
 uint_t istactus           = 0;
 
 int aubio_process(float **input, float **output, int nframes);
 int aubio_process(float **input, float **output, int nframes) {
   unsigned int i;       /*channels*/
   unsigned int j;       /*frames*/
-  smpl_t * btoutput = out->data[0];
   for (j=0;j<(unsigned)nframes;j++) {
     if(usejack) {
       for (i=0;i<channels;i++) {
@@ -46,54 +41,12 @@ int aubio_process(float **input, float **output, int nframes) {
     /*time for fft*/
     if (pos == overlap_size-1) {         
       /* block loop */
-      aubio_pvoc_do (pv,ibuf, fftgrain);
-      aubio_onsetdetection(o,fftgrain, onset);
-      if (usedoubled) {
-        aubio_onsetdetection(o2,fftgrain, onset2);
-        onset->data[0][0] *= onset2->data[0][0];
-      }
-      /* execute every overlap_size*step */
-      if (pos2 == step -1 ) {
-              
-        /* check dfframe */
-        /*
-        outmsg("\n");
-        for (i = 0; i < winlen; i++ ) 
-                outmsg("%f,", dfframe->data[0][i]);
-        outmsg("\n");
-        */
-                        
-        aubio_beattracking_do(bt,dfframe,out);
-
-        /* rotate dfframe */
-        for (i = 0 ; i < winlen - step; i++ ) 
-                dfframe->data[0][i] = dfframe->data[0][i+step];
-        for (i = winlen - step ; i < winlen; i++ ) 
-                dfframe->data[0][i] = 0.;
-                
-        pos2 = -1;
-      }
-      pos2++;
-      isonset = aubio_peakpick_pimrt_wt(onset,parms,&(dfframe->data[0][winlen - step + pos2]));
-      /* end of second level loop */
-      istactus = 0;
-      i=0;
-      for (i = 1; i < btoutput[0]; i++ ) { 
-              if (pos2 == btoutput[i]) {
-                      //printf("pos2: %d\n", pos2);
-                      //printf("tempo:\t%3.5f bpm \n", 
-                      //60.*44100./overlap_size/abs(btoutput[2]-btoutput[1]));
-                      /* test for silence */
-                      if (aubio_silence_detection(ibuf, silence)==1) {
-                              isonset  = 0;
-                              istactus = 0;
-                      } else {
-                              istactus = 1;
-                      }
-              }
-      }
-
-      if (istactus ==1) {
+      aubio_tempo(bt,ibuf,out);
+      if (out->data[0][0]==1) 
+        istactus = 1;
+      else 
+        istactus = 0;
+      if (istactus) {
               for (pos = 0; pos < overlap_size; pos++)
                       obuf->data[0][pos] = woodblock->data[0][pos];
       } else {
@@ -124,24 +77,15 @@ int main(int argc, char **argv) {
   overlap_size = 512;
   /* override default settings */
   examples_common_init(argc,argv);
-  /* configure peak picker */
-  //aubio_peakpicker_set_thresholdfn(parms,vec_mean);
-  //aubio_peakpicker_set_threshold(parms,0.);
-  winlen = SQR(512)/overlap_size;
 
-  dfframe = new_fvec(winlen,channels);
-  step = winlen/4;
-  out = new_fvec(step,channels);
-
-  /* test input : impulses starting from 15, at intervals of 50 samples */
-  //for(i=0;i<16;i++){ 
-  //        dfframe->data[0][50*i+14] = 1.;
-  //}
-
-  bt = new_aubio_beattracking(winlen,channels);
+  out = new_fvec(2,channels);
+  bt  = new_aubio_tempo(type_onset,buffer_size,overlap_size,channels);
 
   examples_common_process(aubio_process,process_print);
 
+  del_aubio_tempo(bt);
+  del_fvec(out);
+
   examples_common_del();
 
   debug("End of program.\n");