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

[aubio.git] / examples / utils.c

diff --git a/examples/utils.c b/examples/utils.c
index 2cb87d2..39d46bb 100644 (file)
--- a/examples/utils.c
+++ b/examples/utils.c
@@ -48,7 +48,7 @@ char_t * pitch_unit = "default";
 char_t * pitch_method = "default";
 smpl_t pitch_tolerance = 0.0; // will be set if != 0.
 // time stuff
-char_t * time_format = "seconds";
+uint_t time_format = 0; // for "seconds", 1 for "ms", 2 for "samples"
 // tempo stuff
 char_t * tempo_method = "default";
 // more general stuff
@@ -64,6 +64,9 @@ aubio_sink_t *this_sink = NULL;
 fvec_t *ibuf;
 fvec_t *obuf;
 
+smpl_t miditap_note = 69.;
+smpl_t miditap_velo = 65.;
+
 /* settings */
 int blocks = 0;
 
@@ -72,7 +75,7 @@ extern int parse_args (int argc, char **argv);
 
 #if HAVE_JACK
 aubio_jack_t *jack_setup;
-#endif
+#endif /* HAVE_JACK */
 
 void examples_common_init (int argc, char **argv);
 void examples_common_del (void);
@@ -114,7 +117,7 @@ void examples_common_init (int argc, char **argv)
     jack_setup = new_aubio_jack (hop_size, 1, 1, 0, 1);
     samplerate = aubio_jack_get_samplerate (jack_setup);
     source_uri = "jack";
-#endif
+#endif /* HAVE_JACK */
   }
   ibuf = new_fvec (hop_size);
   obuf = new_fvec (hop_size);
@@ -137,16 +140,16 @@ void examples_common_process (aubio_process_func_t process_func,
   uint_t read = 0;
   if (usejack) {
 
-#if HAVE_JACK
+#ifdef HAVE_JACK
     debug ("Jack activation ...\n");
     aubio_jack_activate (jack_setup, process_func);
     debug ("Processing (Ctrl+C to quit) ...\n");
     pause ();
     aubio_jack_close (jack_setup);
-#else
+#else /* HAVE_JACK */
     usage (stderr, 1);
     outmsg ("Compiled without jack output, exiting.\n");
-#endif
+#endif /* HAVE_JACK */
 
   } else {
 
@@ -181,7 +184,7 @@ void
 send_noteon (int pitch, int velo)
 {
   smpl_t mpitch = floor (aubio_freqtomidi (pitch) + .5);
-#if HAVE_JACK
+#ifdef HAVE_JACK
   jack_midi_event_t ev;
   ev.size = 3;
   ev.buffer = malloc (3 * sizeof (jack_midi_data_t)); // FIXME
@@ -209,9 +212,9 @@ send_noteon (int pitch, int velo)
 
 void print_time (uint_t time_in_samples) {
   /* output times in selected format */
-  if (strcmp (time_format, "samples") == 0) {
+  if (time_format == 2) {
     outmsg ("%d", time_in_samples);
-  } else if (strcmp (time_format, "ms") == 0) {
+  } else if (time_format == 1) {
     outmsg ("%f", 1000. * time_in_samples / (float) samplerate);
   } else {
     outmsg ("%f", time_in_samples / (float) samplerate);