Changeset d4c5de7 for examples/aubiotrack.c

Timestamp:

Oct 16, 2009, 11:03:08 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:

6107f4c

Parents:

2828382

Message:

examples/: make use of aubio_onset in aubioonset and aubionotes, simplify, keep only general stuff in utils

File:

• examples/aubiotrack.c (modified) (4 diffs)

examples/aubiotrack.c

@@ -20 +20 @@
 #include "utils.h"
 
-unsigned int pos          = 0;    /* frames%dspblocksize */
-uint_t usepitch           = 0;
-fvec_t * out              = NULL;
-aubio_tempo_t * bt        = NULL;
-smpl_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(smpl_t **input, smpl_t **output, int nframes);
-int aubio_process(smpl_t **input, smpl_t **output, int nframes) {
+static int aubio_process(smpl_t **input, smpl_t **output, int nframes) {
   unsigned int i;       /*channels*/
   unsigned int j;       /*frames*/
@@ -42 +41 @@
     if (pos == overlap_size-1) {         
       /* block loop */
-      aubio_tempo_do (bt,ibuf,out);
-      if (out->data[0][0]>=1) 
-        istactus = out->data[0][0];
+      aubio_tempo_do (bt,ibuf,tempo_out);
+      if (tempo_out->data[0][0]>0) 
+        istactus = tempo_out->data[0][0];
       else 
         istactus = 0;
+      if (tempo_out->data[0][1]>0) 
+        isonset = tempo_out->data[0][0];
+      else 
+        isonset = 0;
       if (istactus) {
               for (pos = 0; pos < overlap_size; pos++)
@@ -62 +65 @@
 }
 
-void process_print (void);
-void process_print (void) {
+static void process_print (void) {
         if (output_filename == NULL) {
                 if (istactus) {
@@ -80 +82 @@
   examples_common_init(argc,argv);
 
-  out = new_fvec(2,channels);
-  bt  = new_aubio_tempo(onset_mode,buffer_size,overlap_size,channels);
+  tempo_out = new_fvec(2,channels);
+  bt = new_aubio_tempo(onset_mode,buffer_size,overlap_size,channels, samplerate);
 
   examples_common_process(aubio_process,process_print);
 
   del_aubio_tempo(bt);
-  del_fvec(out);
+  del_fvec(tempo_out);
 
   examples_common_del();