examples/: only send a last note off when using jack

[aubio.git] / examples / aubiotrack.c

diff --git a/examples/aubiotrack.c b/examples/aubiotrack.c
index 37dc05d..787c308 100644 (file)
--- a/examples/aubiotrack.c
+++ b/examples/aubiotrack.c
@@ -21,6 +21,7 @@
 #include "utils.h"
 #define PROG_HAS_TEMPO 1
 #define PROG_HAS_ONSET 1
+#define PROG_HAS_SILENCE 1
 #define PROG_HAS_OUTPUT 1
 #define PROG_HAS_JACK 1
 #include "parse_args.h"
@@ -28,8 +29,8 @@
 aubio_tempo_t * tempo;
 aubio_wavetable_t *wavetable;
 fvec_t * tempo_out;
-smpl_t is_beat = 0;
-uint_t is_silence = 0.;
+smpl_t is_beat = 0.;
+uint_t is_silence = 0;
 
 void process_block(fvec_t * ibuf, fvec_t *obuf) {
   aubio_tempo_do (tempo, ibuf, tempo_out);
@@ -40,18 +41,8 @@ void process_block(fvec_t * ibuf, fvec_t *obuf) {
   fvec_zeros (obuf);
   if ( is_beat && !is_silence ) {
     aubio_wavetable_play ( wavetable );
-    /* Send tap over midi output */
-    /* Is called without jack use so ask for jack use */
-    if (usejack)
-    {
-       /* Note on midi clock: Midi clock looks like it is more suitable here,
-       * but it is send 24 times between the detected bpm which is impossible
-       * to do since we get here only once per peat.
-       * Therefore midinote is used as a good workaround.
-       * Reference:
-       * http://www.blitter.com/~russtopia/MIDI/~jglatt/tech/midispec/clock.htm */
-      send_noteon(0, 0);
-    }
+    /* 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 );
   }
@@ -69,6 +60,7 @@ void process_print (void) {
 }
 
 int main(int argc, char **argv) {
+  int ret = 0;
   // override general settings from utils.c
   buffer_size = 1024;
   hop_size = 512;
@@ -84,6 +76,7 @@ int main(int argc, char **argv) {
 
   tempo_out = new_fvec(2);
   tempo = new_aubio_tempo(tempo_method, buffer_size, hop_size, samplerate);
+  if (tempo == NULL) { ret = 1; goto beach; }
   // set silence threshold very low to output beats even during silence
   // aubio_tempo_set_silence(tempo, -1000.);
   if (onset_threshold != 0.) aubio_tempo_set_threshold (tempo, onset_threshold);
@@ -94,11 +87,16 @@ int main(int argc, char **argv) {
 
   examples_common_process((aubio_process_func_t)process_block,process_print);
 
+  // send a last note off
+  if (usejack) {
+    send_noteon (miditap_note, 0);
+  }
+
   del_aubio_tempo(tempo);
   del_aubio_wavetable (wavetable);
   del_fvec(tempo_out);
 
+beach:
   examples_common_del();
-  return 0;
+  return ret;
 }
-