coreaudio: correctly clear MIDI port buffers

[ardour.git] / libs / backends / coreaudio / coremidi_io.cc

diff --git a/libs/backends/coreaudio/coremidi_io.cc b/libs/backends/coreaudio/coremidi_io.cc
index 8b6bad82e8108daaba889ecc7802f70d554c357c..a64fade8e33fcb6dbdebd6130312fbf7d9f8e057 100644 (file)
--- a/libs/backends/coreaudio/coremidi_io.cc
+++ b/libs/backends/coreaudio/coremidi_io.cc
@@ -24,28 +24,71 @@
 
 using namespace ARDOUR;
 
+#ifndef NDEBUG
+static int _debug_mode = 0;
+#endif
+
 static void notifyProc (const MIDINotification *message, void *refCon) {
        CoreMidiIo *self = static_cast<CoreMidiIo*>(refCon);
        self->notify_proc(message);
 }
 
+#ifndef NDEBUG
+static void print_packet (const MIDIPacket *p) {
+       fprintf (stderr, "CoreMIDI: Packet %d bytes [ ", p->length);
+       for (int bb = 0; bb < p->length; ++bb) {
+               fprintf (stderr, "%02x ", ((uint8_t*)p->data)[bb]);
+       }
+       fprintf (stderr, "]\n");
+}
+
+static void dump_packet_list (const UInt32 numPackets, MIDIPacket const *p) {
+       for (UInt32 i = 0; i < numPackets; ++i) {
+               print_packet (p);
+               p = MIDIPacketNext (p);
+       }
+}
+#endif
+
 static void midiInputCallback(const MIDIPacketList *list, void *procRef, void *srcRef) {
        CoreMidiIo *self = static_cast<CoreMidiIo*> (procRef);
        if (!self || !self->enabled()) {
                // skip while freewheeling
+#ifndef NDEBUG
+               if (_debug_mode & 2) {
+                       fprintf (stderr, "Ignored Midi Packet while freewheeling:\n");
+                       dump_packet_list (list->numPackets, &list->packet[0]);
+               }
+#endif
                return;
        }
        RingBuffer<uint8_t> * rb  = static_cast<RingBuffer < uint8_t > *> (srcRef);
-       if (!rb) return;
+       if (!rb) {
+#ifndef NDEBUG
+               if (_debug_mode & 4) {
+                       fprintf (stderr, "Ignored Midi Packet - no ringbuffer:\n");
+                       dump_packet_list (list->numPackets, &list->packet[0]);
+               }
+#endif
+               return;
+       }
        MIDIPacket const *p = &list->packet[0];
        for (UInt32 i = 0; i < list->numPackets; ++i) {
                uint32_t len = ((p->length + 3)&~3) + sizeof(MIDITimeStamp) + sizeof(UInt16);
-               if (rb->write_space() < sizeof(uint32_t) + len) {
-                       fprintf(stderr, "CoreMIDI: dropped MIDI event\n");
-                       continue;
+#ifndef NDEBUG
+               if (_debug_mode & 1) {
+                       print_packet (p);
+               }
+#endif
+               if (rb->write_space() > sizeof(uint32_t) + len) {
+                       rb->write ((uint8_t*)&len, sizeof(uint32_t));
+                       rb->write ((uint8_t*)p, len);
+               }
+#ifndef NDEBUG
+               else {
+                       fprintf (stderr, "CoreMIDI: dropped MIDI event\n");
                }
-               rb->write ((uint8_t*)&len, sizeof(uint32_t));
-               rb->write ((uint8_t*)p, len);
+#endif
                p = MIDIPacketNext (p);
        }
 }
@@ -88,6 +131,11 @@ CoreMidiIo::CoreMidiIo()
        , _changed_arg (0)
 {
        pthread_mutex_init (&_discovery_lock, 0);
+
+#ifndef NDEBUG
+       const char *p = getenv ("COREMIDIDEBUG");
+       if (p && *p) _debug_mode = atoi (p);
+#endif
 }
 
 CoreMidiIo::~CoreMidiIo()
@@ -200,10 +248,16 @@ CoreMidiIo::recv_event (uint32_t port, double cycle_time_us, uint64_t &time, uin
                if ((*it)->timeStamp < end) {
                        if ((*it)->timeStamp < start) {
                                uint64_t dt = AudioConvertHostTimeToNanos(start - (*it)->timeStamp);
-                               //printf("Stale Midi Event dt:%.2fms\n", dt * 1e-6);
-                               if (dt > 1e-4) { // 100ms, maybe too large
+                               if (dt > 1e7) { // 10ms,
+#ifndef NDEBUG
+                                       printf("Dropped Stale Midi Event. dt:%.2fms\n", dt * 1e-6);
+#endif
                                        it = _input_queue[port].erase(it);
                                        continue;
+                               } else {
+#if 0
+                                       printf("Stale Midi Event. dt:%.2fms\n", dt * 1e-6);
+#endif
                                }
                                time = 0;
                        } else {
@@ -291,7 +345,7 @@ CoreMidiIo::port_id (uint32_t port, bool input)
                ss << "system:midi_capture_";
                SInt32 id;
                if (noErr == MIDIObjectGetIntegerProperty(_input_endpoints[port], kMIDIPropertyUniqueID, &id)) {
-                       ss << (int)id;
+                       ss << (unsigned int)id;
                } else {
                        ss << port;
                }
@@ -299,7 +353,7 @@ CoreMidiIo::port_id (uint32_t port, bool input)
                ss << "system:midi_playback_";
                SInt32 id;
                if (noErr == MIDIObjectGetIntegerProperty(_output_endpoints[port], kMIDIPropertyUniqueID, &id)) {
-                       ss << (int)id;
+                       ss << (unsigned int)id;
                } else {
                        ss << port;
                }
@@ -391,7 +445,7 @@ CoreMidiIo::discover()
                        fprintf(stderr, "Cannot create Midi Output\n");
                        continue;
                }
-               _rb[_n_midi_in] = new RingBuffer<uint8_t>(1024 * sizeof(MIDIPacket));
+               _rb[_n_midi_in] = new RingBuffer<uint8_t>(32768);
                _input_queue[_n_midi_in] = CoreMIDIQueue();
                MIDIPortConnectSource(_input_ports[_n_midi_in], src, (void*) _rb[_n_midi_in]);
                CFRelease(port_name);