examples/: also emit midi note from aubioonset, thanks to topas-rec (closes #62)

[aubio.git] / examples / aubioonset.c

diff --git a/examples/aubioonset.c b/examples/aubioonset.c
index 36fb8ac..69e7bc9 100644 (file)
--- a/examples/aubioonset.c
+++ b/examples/aubioonset.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2003-2009 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
 
@@ -19,74 +19,74 @@
 */
 
 #include "utils.h"
-
-unsigned int pos = 0; /*frames%dspblocksize*/
+#define PROG_HAS_ONSET 1
+#define PROG_HAS_OUTPUT 1
+#define PROG_HAS_JACK 1
+#include "parse_args.h"
 
 aubio_onset_t *o;
+aubio_wavetable_t *wavetable;
 fvec_t *onset;
-
-static int aubio_process(smpl_t **input, smpl_t **output, int nframes) {
-  unsigned int i;       /*channels*/
-  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);
-      }
-    }
-    /*time for fft*/
-    if (pos == overlap_size-1) {         
-      /* block loop */
-      aubio_onset_do (o, ibuf, onset);
-      if (fvec_read_sample(onset, 0, 0)) {
-        fvec_copy (woodblock, obuf);
-      } else {
-        fvec_zeros (obuf);
-      }
-      /* end of block loop */
-      pos = -1; /* so it will be zero next j loop */
-    }
-    pos++;
+smpl_t is_onset;
+
+void process_block(fvec_t *ibuf, fvec_t *obuf)
+{
+  aubio_onset_do (o, ibuf, onset);
+  is_onset = fvec_get_sample(onset, 0);
+  if ( !usejack && ! sink_uri ) return;
+  fvec_zeros(obuf);
+  if ( is_onset ) {
+    aubio_wavetable_play ( wavetable );
+    /* send a midi tap (default to C0) out to the midi output */
+    if (usejack) send_noteon(miditap_note, miditap_velo);
+  } else {
+    aubio_wavetable_stop ( wavetable );
   }
-  return 1;
+  if (mix_input)
+    aubio_wavetable_do (wavetable, ibuf, obuf);
+  else
+    aubio_wavetable_do (wavetable, obuf, obuf);
 }
 
-static void process_print (void) {
-      /* output times in seconds, taking back some 
-       * delay to ensure the label is _before_ the
-       * actual onset */
-      if (!verbose && usejack) return;
-      smpl_t onset_found = fvec_read_sample(onset, 0, 0);
-      if (onset_found) {
-        if(frames >= 4) {
-          outmsg("%f\n",(frames - frames_delay + onset_found) 
-                  *overlap_size/(float)samplerate);
-        } else if (frames < frames_delay) {
-          outmsg("%f\n",0.);
-        }
-      }
+void process_print (void)
+{
+  if ( is_onset ) {
+    print_time(aubio_onset_get_last (o));
+    outmsg ("\n");
+  }
 }
 
 int main(int argc, char **argv) {
-  frames_delay = 3;
   examples_common_init(argc,argv);
 
-  o = new_aubio_onset (onset_mode, buffer_size, overlap_size, channels,
-          samplerate);
-  if (threshold != 0.) aubio_onset_set_threshold (o, threshold);
-  onset = new_fvec (1, channels);
+  verbmsg ("using source: %s at %dHz\n", source_uri, samplerate);
+  verbmsg ("onset method: %s, ", onset_method);
+  verbmsg ("buffer_size: %d, ", buffer_size);
+  verbmsg ("hop_size: %d, ", hop_size);
+  verbmsg ("silence: %f, ", silence_threshold);
+  verbmsg ("threshold: %f\n", onset_threshold);
+
+  o = new_aubio_onset (onset_method, buffer_size, hop_size, samplerate);
+  if (onset_threshold != 0.)
+    aubio_onset_set_threshold (o, onset_threshold);
+  if (silence_threshold != -90.)
+    aubio_onset_set_silence (o, silence_threshold);
 
-  examples_common_process(aubio_process,process_print);
+  onset = new_fvec (1);
+
+  wavetable = new_aubio_wavetable (samplerate, hop_size);
+  aubio_wavetable_set_freq ( wavetable, 2450.);
+  //aubio_sampler_load (sampler, "/archives/sounds/woodblock.aiff");
+
+  examples_common_process((aubio_process_func_t)process_block, process_print);
+
+  // send a last note off
+  send_noteon (miditap_note, 0);
 
   del_aubio_onset (o);
+  del_aubio_wavetable (wavetable);
   del_fvec (onset);
 
   examples_common_del();
-  debug("End of program.\n");
-  fflush(stderr);
   return 0;
 }
-