Changeset 9562f08

Timestamp:

Jul 22, 2016, 9:30:31 PM (8 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:

65fc06f

Parents:

f280ebd

Message:

examples/utils.c: change send_noteon to accept floating point midi note number

Location:

examples

Files:

• aubionotes.c (modified) (3 diffs)
• utils.c (modified) (3 diffs)
• utils.h (modified) (1 diff)

examples/aubionotes.c

@@ -27 +27 @@
 
 aubio_notes_t *notes;
-uint_t lastnote = 0;
+smpl_t lastmidi = 0.;
 
 void process_block (fvec_t *ibuf, fvec_t *obuf)
@@ -34 +34 @@
   // did we get a note off?
   if (obuf->data[2] != 0) {
-    send_noteon(obuf->data[2], 0);
+    lastmidi = aubio_freqtomidi (obuf->data[2]) + .5;
+    send_noteon(lastmidi, 0);
   }
   // did we get a note on?
   if (obuf->data[0] != 0) {
-    send_noteon(obuf->data[0], obuf->data[1]);
-    lastnote = (uint_t) floor(obuf->data[0]);
+    lastmidi = aubio_freqtomidi (obuf->data[0]) + .5;
+    send_noteon(lastmidi, obuf->data[1]);
   }
 }
@@ -68 +69 @@
 
   // send a last note off
-  send_noteon (lastnote, 0);
+  send_noteon (lastmidi, 0);
 
   del_aubio_notes (notes);

examples/utils.c

@@ -182 +182 @@
 
 void
-send_noteon (int pitch, int velo)
-{
-  smpl_t mpitch = floor (aubio_freqtomidi (pitch) + .5);
+send_noteon (smpl_t pitch, smpl_t velo)
+{
 #ifdef HAVE_JACK
   jack_midi_event_t ev;
@@ -192 +191 @@
   if (usejack) {
     ev.buffer[2] = velo;
-    ev.buffer[1] = mpitch;
+    ev.buffer[1] = pitch;
     if (velo == 0) {
       ev.buffer[0] = 0x80;      /* note off */
@@ -205 +204 @@
     outmsg ("\n");
   } else {
-    outmsg ("%f\t", mpitch);
+    outmsg ("%f\t", pitch);
     print_time (blocks * hop_size);
     outmsg ("\t");

examples/utils.h

@@ -64 +64 @@
 
 typedef void (aubio_print_func_t) (void);
-void send_noteon (int pitch, int velo);
+void send_noteon (smpl_t pitch, smpl_t velo);
 
 /** common process function */