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 7a80acc..69e7bc9 100644 (file)
--- a/examples/aubioonset.c
+++ b/examples/aubioonset.c
@@ -20,30 +20,39 @@
 
 #include "utils.h"
 #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;
+smpl_t is_onset;
 
-void
-process_block(fvec_t *ibuf, fvec_t *obuf) {
-  fvec_zeros(obuf);
+void process_block(fvec_t *ibuf, fvec_t *obuf)
+{
   aubio_onset_do (o, ibuf, onset);
-  if ( fvec_read_sample(onset, 0) ) {
+  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 );
   }
-  aubio_wavetable_do (wavetable, obuf, obuf);
+  if (mix_input)
+    aubio_wavetable_do (wavetable, ibuf, obuf);
+  else
+    aubio_wavetable_do (wavetable, obuf, obuf);
 }
 
-void
-process_print (void)
+void process_print (void)
 {
-  smpl_t onset_found = fvec_read_sample (onset, 0);
-  if (onset_found) {
-    outmsg ("%f\n", aubio_onset_get_last_s (o) );
+  if ( is_onset ) {
+    print_time(aubio_onset_get_last (o));
+    outmsg ("\n");
   }
 }
 
@@ -54,10 +63,15 @@ int main(int argc, char **argv) {
   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 (onset_threshold != 0.)
+    aubio_onset_set_threshold (o, onset_threshold);
+  if (silence_threshold != -90.)
+    aubio_onset_set_silence (o, silence_threshold);
+
   onset = new_fvec (1);
 
   wavetable = new_aubio_wavetable (samplerate, hop_size);
@@ -66,6 +80,9 @@ int main(int argc, char **argv) {
 
   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);