web.cfg: exclude hist.h

[aubio.git] / examples / aubiotrack.c

diff --git a/examples/aubiotrack.c b/examples/aubiotrack.c
index 6edcd919b92ae4a6d9d4cbb014e8b2922de87570..5c663695cf8bc0958293b88fa970faf4a441f890 100644 (file)
--- a/examples/aubiotrack.c
+++ b/examples/aubiotrack.c
@@ -1,57 +1,51 @@
 /*
-   Copyright (C) 2003 Paul Brossier
+  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
 
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+  This file is part of aubio.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+  aubio is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  aubio is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with aubio.  If not, see <http://www.gnu.org/licenses/>.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
 #include <aubio.h>
 #include "utils.h"
 
-unsigned int pos          = 0;    /* frames%dspblocksize */
-uint_t usepitch           = 0;
-fvec_t * out              = NULL;
-aubio_tempo_t * bt        = NULL;
-uint_t istactus           = 0;
+uint_t pos = 0;    /* frames%dspblocksize */
+fvec_t * tempo_out = NULL;
+aubio_tempo_t * bt = NULL;
+smpl_t istactus = 0;
+smpl_t isonset = 0;
 
-int aubio_process(float **input, float **output, int nframes);
-int aubio_process(float **input, float **output, int nframes) {
-  unsigned int i;       /*channels*/
+static int aubio_process(smpl_t **input, smpl_t **output, int nframes) {
   unsigned int j;       /*frames*/
   for (j=0;j<(unsigned)nframes;j++) {
     if(usejack) {
-      for (i=0;i<channels;i++) {
-        /* write input to datanew */
-        fvec_write_sample(ibuf, input[i][j], i, pos);
-        /* put synthnew in output */
-        output[i][j] = fvec_read_sample(obuf, i, pos);
-      }
+      /* write input to datanew */
+      fvec_write_sample(ibuf, input[0][j], pos);
+      /* put synthnew in output */
+      output[0][j] = fvec_read_sample(obuf, pos);
     }
     /*time for fft*/
     if (pos == overlap_size-1) {         
       /* block loop */
-      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];
+      aubio_tempo_do (bt,ibuf,tempo_out);
+      istactus = fvec_read_sample (tempo_out, 0);
+      isonset = fvec_read_sample (tempo_out, 1);
+      if (istactus > 0.) {
+        fvec_copy (woodblock, obuf);
       } else {
-              for (pos = 0; pos < overlap_size; pos++)
-                      obuf->data[0][pos] = 0.;
+        fvec_zeros (obuf);
       }
       /* end of block loop */
       pos = -1; /* so it will be zero next j loop */
@@ -61,11 +55,11 @@ int aubio_process(float **input, float **output, int nframes) {
   return 1;
 }
 
-void process_print (void);
-void process_print (void) {
-        if (output_filename == NULL) {
-                if (istactus)
-                        outmsg("%f\n",(frames)*overlap_size/(float)samplerate); 
+static void process_print (void) {
+        if (sink_uri == NULL) {
+                if (istactus) {
+                        outmsg("%f\n",((smpl_t)(frames*overlap_size)+(istactus-1.)*overlap_size)/(smpl_t)samplerate); 
+                }
                 if (isonset && verbose)
                         outmsg(" \t \t%f\n",(frames)*overlap_size/(float)samplerate);
         }
@@ -78,13 +72,14 @@ int main(int argc, char **argv) {
   /* override default settings */
   examples_common_init(argc,argv);
 
-  out = new_fvec(2,channels);
-  bt  = new_aubio_tempo(type_onset,buffer_size,overlap_size,channels);
+  tempo_out = new_fvec(2);
+  bt = new_aubio_tempo(onset_mode,buffer_size,overlap_size, samplerate);
+  if (threshold != 0.) aubio_tempo_set_threshold (bt, threshold);
 
   examples_common_process(aubio_process,process_print);
 
   del_aubio_tempo(bt);
-  del_fvec(out);
+  del_fvec(tempo_out);
 
   examples_common_del();