Sort session routes before trying to do the group tabs

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

diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc
index 77fe712c5caeb28b84fc273bb74077fc68338803..50d4ce64e83f784675136e42db080bd143c018af 100644 (file)
--- a/libs/ardour/midi_port.cc
+++ b/libs/ardour/midi_port.cc
@@ -30,6 +30,7 @@ MidiPort::MidiPort (const std::string& name, Flags flags)
        : Port (name, DataType::MIDI, flags)
        , _has_been_mixed_down (false)
        , _resolve_required (false)
+       , _input_active (true)
 {
        _buffer = new MidiBuffer (AudioEngine::instance()->raw_buffer_size (DataType::MIDI));
 }
@@ -62,36 +63,42 @@ MidiPort::get_midi_buffer (pframes_t nframes)
 
        if (receives_input ()) {
 
-               void* jack_buffer = jack_port_get_buffer (_jack_port, nframes);
-               const pframes_t event_count = jack_midi_get_event_count (jack_buffer);
-
-               assert (event_count < _buffer->capacity());
-
-               /* suck all relevant MIDI events from the JACK MIDI port buffer
-                  into our MidiBuffer
-               */
-
-               for (pframes_t i = 0; i < event_count; ++i) {
-
-                       jack_midi_event_t ev;
-
-                       jack_midi_event_get (&ev, jack_buffer, i);
-
-                       if (ev.buffer[0] == 0xfe) {
-                               /* throw away active sensing */
-                               continue;
-                       }
-
-                       /* check that the event is in the acceptable time range */
+               if (_input_active) {
+
+                       void* jack_buffer = jack_port_get_buffer (_jack_port, nframes);
+                       const pframes_t event_count = jack_midi_get_event_count (jack_buffer);
+                       
+                       assert (event_count < _buffer->capacity());
+                       
+                       /* suck all relevant MIDI events from the JACK MIDI port buffer
+                          into our MidiBuffer
+                       */
+                       
+                       for (pframes_t i = 0; i < event_count; ++i) {
+                               
+                               jack_midi_event_t ev;
+                               
+                               jack_midi_event_get (&ev, jack_buffer, i);
+                               
+                               if (ev.buffer[0] == 0xfe) {
+                                       /* throw away active sensing */
+                                       continue;
+                               }
+                               
+                               /* check that the event is in the acceptable time range */
+                               
+                               if ((ev.time >= (_global_port_buffer_offset + _port_buffer_offset)) &&
+                                   (ev.time < (_global_port_buffer_offset + _port_buffer_offset + nframes))) {
+                                       _buffer->push_back (ev);
+                               } else {
+                                       cerr << "Dropping incoming MIDI at time " << ev.time << "; offset="
+                                            << _global_port_buffer_offset << " limit="
+                                            << (_global_port_buffer_offset + _port_buffer_offset + nframes) << "\n";
+                               }
+                       } 
 
-                       if ((ev.time >= (_global_port_buffer_offset + _port_buffer_offset)) && 
-                           (ev.time < (_global_port_buffer_offset + _port_buffer_offset + nframes))) {
-                               _buffer->push_back (ev);
-                       } else {
-                               cerr << "Dropping incoming MIDI at time " << ev.time << "; offset=" 
-                                    << _global_port_buffer_offset << " limit=" 
-                                    << (_global_port_buffer_offset + _port_buffer_offset + nframes) << "\n";
-                       }
+               } else {
+                       _buffer->silence (nframes);
                }
 
        } else {
@@ -122,33 +129,33 @@ void
 MidiPort::resolve_notes (void* jack_buffer, MidiBuffer::TimeType when)
 {
        uint8_t ev[3];
-       
+
        ev[2] = 0;
-       
+
        for (uint8_t channel = 0; channel <= 0xF; channel++) {
                ev[0] = (MIDI_CMD_CONTROL | channel);
-               
+
                /* we need to send all notes off AND turn the
                 * sustain/damper pedal off to handle synths
                 * that prioritize sustain over AllNotesOff
                 */
-               
+
                ev[1] = MIDI_CTL_SUSTAIN;
-               
+
                if (jack_midi_event_write (jack_buffer, when, ev, 3) != 0) {
                        cerr << "failed to deliver sustain-zero on channel " << channel << " on port " << name() << endl;
-               } 
-               
+               }
+
                ev[1] = MIDI_CTL_ALL_NOTES_OFF;
-               
+
                if (jack_midi_event_write (jack_buffer, 0, ev, 3) != 0) {
                        cerr << "failed to deliver ALL NOTES OFF on channel " << channel << " on port " << name() << endl;
-               } 
+               }
        }
 }
 
 void
-MidiPort::flush_buffers (pframes_t nframes, framepos_t time)
+MidiPort::flush_buffers (pframes_t nframes, framepos_t /*time*/)
 {
        if (sends_output ()) {
 
@@ -175,11 +182,11 @@ MidiPort::flush_buffers (pframes_t nframes, framepos_t time)
 
                        if (ev.time() >= _global_port_buffer_offset + _port_buffer_offset) {
                                if (jack_midi_event_write (jack_buffer, (jack_nframes_t) ev.time(), ev.buffer(), ev.size()) != 0) {
-                                       cerr << "write failed, drop flushed note off on the floor, time " 
+                                       cerr << "write failed, drop flushed note off on the floor, time "
                                             << ev.time() << " > " << _global_port_buffer_offset + _port_buffer_offset << endl;
                                }
                        } else {
-                               cerr << "drop flushed event on the floor, time " << ev.time() 
+                               cerr << "drop flushed event on the floor, time " << ev.time()
                                     << " < " << _global_port_buffer_offset + _port_buffer_offset << endl;
                        }
                }
@@ -205,3 +212,9 @@ MidiPort::reset ()
        delete _buffer;
        _buffer = new MidiBuffer (AudioEngine::instance()->raw_buffer_size (DataType::MIDI));
 }
+
+void
+MidiPort::set_input_active (bool yn)
+{
+       _input_active = yn;
+}