expose more info from plugin-strip (for GUI display)

[ardour.git] / libs / ardour / midi_port.cc

diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc
index ccd6e9848b6b7edb88e9f3d4b64d84acff6d8cc2..2942aded75012b34e6b2114e5468bc5f38613642 100644 (file)
--- a/libs/ardour/midi_port.cc
+++ b/libs/ardour/midi_port.cc
@@ -67,14 +67,14 @@ MidiPort::cycle_start (pframes_t nframes)
                MidiBuffer& mb (get_midi_buffer (nframes));
 
                /* dump incoming MIDI to parser */
-               
+
                for (MidiBuffer::iterator b = mb.begin(); b != mb.end(); ++b) {
                        uint8_t* buf = (*b).buffer();
-                       
+
                        _self_parser.set_timestamp (now + (*b).time());
-                       
+
                        uint32_t limit = (*b).size();
-                       
+
                        for (size_t n = 0; n < limit; ++n) {
                                _self_parser.scanner (buf[n]);
                        }
@@ -107,24 +107,24 @@ MidiPort::get_midi_buffer (pframes_t nframes)
                        */
 
                        for (pframes_t i = 0; i < event_count; ++i) {
-                               
+
                                pframes_t timestamp;
                                size_t size;
                                uint8_t* buf;
-                               
+
                                port_engine.midi_event_get (timestamp, size, &buf, buffer, i);
-                               
+
                                if (buf[0] == 0xfe) {
                                        /* throw away active sensing */
                                        continue;
-                               } if (buf[0] == 0x90 && buf[2] == 0) {
+                               } else if ((buf[0] & 0xF0) == 0x90 && buf[2] == 0) {
                                        /* normalize note on with velocity 0 to proper note off */
-                                       buf[0] = 0x80;  /* note off */
+                                       buf[0] = 0x80 | (buf[0] & 0x0F);  /* note off */
                                        buf[2] = 0x40;  /* default velocity */
                                }
-                               
+
                                /* check that the event is in the acceptable time range */
-                               
+
                                if ((timestamp >= (_global_port_buffer_offset + _port_buffer_offset)) &&
                                    (timestamp < (_global_port_buffer_offset + _port_buffer_offset + nframes))) {
                                        _buffer->push_back (timestamp, size, buf);
@@ -133,7 +133,7 @@ MidiPort::get_midi_buffer (pframes_t nframes)
                                             << _global_port_buffer_offset << " limit="
                                             << (_global_port_buffer_offset + _port_buffer_offset + nframes) << "\n";
                                }
-                       } 
+                       }
 
                } else {
                        _buffer->silence (nframes);
@@ -180,7 +180,7 @@ MidiPort::resolve_notes (void* port_buffer, MidiBuffer::TimeType when)
 
                ev[1] = MIDI_CTL_ALL_NOTES_OFF;
 
-               if (port_engine.midi_event_put (port_buffer, 0, ev, 3) != 0) {
+               if (port_engine.midi_event_put (port_buffer, when, ev, 3) != 0) {
                        cerr << "failed to deliver ALL NOTES OFF on channel " << (int)channel << " on port " << name() << endl;
                }
        }
@@ -192,14 +192,14 @@ MidiPort::flush_buffers (pframes_t nframes)
        if (sends_output ()) {
 
                void* port_buffer = 0;
-               
+
                if (_resolve_required) {
                        port_buffer = port_engine.get_buffer (_port_handle, nframes);
                        /* resolve all notes at the start of the buffer */
-                       resolve_notes (port_buffer, 0);
+                       resolve_notes (port_buffer, _global_port_buffer_offset);
                        _resolve_required = false;
-               } 
-               
+               }
+
                if (_buffer->empty()) {
                        return;
                }
@@ -216,12 +216,12 @@ MidiPort::flush_buffers (pframes_t nframes)
 
                        if (sends_output() && _trace_on) {
                                uint8_t const * const buf = ev.buffer();
-                               const framepos_t now = AudioEngine::instance()->sample_time_at_cycle_start();                           
+                               const framepos_t now = AudioEngine::instance()->sample_time_at_cycle_start();
 
                                _self_parser.set_timestamp (now + ev.time());
-                               
+
                                uint32_t limit = ev.size();
-                               
+
                                for (size_t n = 0; n < limit; ++n) {
                                        _self_parser.scanner (buf[n]);
                                }
@@ -231,18 +231,18 @@ MidiPort::flush_buffers (pframes_t nframes)
                        // event times are in frames, relative to cycle start
 
 #ifndef NDEBUG
-       if (DEBUG::MidiIO & PBD::debug_bits) {
-               DEBUG_STR_DECL(a);
-               DEBUG_STR_APPEND(a, string_compose ("MidiPort %1 pop event    @ %2 sz %3 ", _buffer, ev.time(), ev.size()));
-               for (size_t i=0; i < ev.size(); ++i) {
-                       DEBUG_STR_APPEND(a,hex);
-                       DEBUG_STR_APPEND(a,"0x");
-                       DEBUG_STR_APPEND(a,(int)(ev.buffer()[i]));
-                       DEBUG_STR_APPEND(a,' ');
-               }
-               DEBUG_STR_APPEND(a,'\n');
-               DEBUG_TRACE (DEBUG::MidiIO, DEBUG_STR(a).str());
-       }
+                       if (DEBUG_ENABLED (DEBUG::MidiIO)) {
+                               DEBUG_STR_DECL(a);
+                               DEBUG_STR_APPEND(a, string_compose ("MidiPort %1 pop event    @ %2 sz %3 ", _buffer, ev.time(), ev.size()));
+                               for (size_t i=0; i < ev.size(); ++i) {
+                                       DEBUG_STR_APPEND(a,hex);
+                                       DEBUG_STR_APPEND(a,"0x");
+                                       DEBUG_STR_APPEND(a,(int)(ev.buffer()[i]));
+                                       DEBUG_STR_APPEND(a,' ');
+                               }
+                               DEBUG_STR_APPEND(a,'\n');
+                               DEBUG_TRACE (DEBUG::MidiIO, DEBUG_STR(a).str());
+                       }
 #endif
 
                        assert (ev.time() < (nframes + _global_port_buffer_offset + _port_buffer_offset));
@@ -263,7 +263,7 @@ MidiPort::flush_buffers (pframes_t nframes)
                        }
                }
 
-               /* done.. the data has moved to the port buffer, mark it so 
+               /* done.. the data has moved to the port buffer, mark it so
                 */
 
                _buffer->clear ();