Remove unnecessary 0 checks before delete; see http://www.parashift.com/c++-faq-lite...

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

diff --git a/libs/ardour/jack_midi_port.cc b/libs/ardour/jack_midi_port.cc
index 6d8e4c8c5d24966bcd0770e4b5067b623d98802d..4b7b66c659aaba01ddaa565f3a7015a21bc8648a 100644 (file)
--- a/libs/ardour/jack_midi_port.cc
+++ b/libs/ardour/jack_midi_port.cc
@@ -24,6 +24,7 @@ JackMidiPort::JackMidiPort (const std::string& name, Flags flgs, MidiBuffer* buf
        : Port (name, flgs)
        , JackPort (name, DataType::MIDI, flgs)
        , BaseMidiPort (name, flgs) 
+       , _has_been_mixed_down (false)
 {
        // MIDI ports always need a buffer since jack buffer format is different
        assert(buf);
@@ -40,10 +41,27 @@ JackMidiPort::cycle_start (nframes_t nframes, nframes_t offset)
        _buffer->clear();
        assert(_buffer->size() == 0);
 
-       if (_flags & IsOutput) {
+       if (_flags & IsInput) {
                return;
        }
 
+       // We're an output - delete the midi_events.
+       
+       void* jack_buffer = jack_port_get_buffer (_port, nframes);
+
+       jack_midi_clear_buffer (jack_buffer);
+}
+
+MidiBuffer &
+JackMidiPort::get_midi_buffer( nframes_t nframes, nframes_t offset ) {
+
+       if (_has_been_mixed_down)
+           return *_buffer;
+
+       if (_flags & IsOutput) {
+               return *_buffer;
+       }
+
        // We're an input - copy Jack events to internal buffer
        
        void* jack_buffer = jack_port_get_buffer(_port, nframes);
@@ -57,13 +75,19 @@ JackMidiPort::cycle_start (nframes_t nframes, nframes_t offset)
 
                jack_midi_event_get (&ev, jack_buffer, i);
 
-               _buffer->push_back (ev);
+               // i guess this should do but i leave it off to test the rest first.
+               //if (ev.time > offset && ev.time < offset+nframes)
+                       _buffer->push_back (ev);
        }
 
        assert(_buffer->size() == event_count);
 
        /*if (_buffer->size() > 0)
                cerr << "JackMIDIPort got " << event_count << " events (buf " << _buffer << ")" << endl;*/
+       if (nframes)
+               _has_been_mixed_down = true;
+
+       return *_buffer;
 }
 
 void
@@ -71,6 +95,9 @@ JackMidiPort::cycle_end (nframes_t nframes, nframes_t offset)
 {
        /* FIXME: offset */
 
+       _has_been_mixed_down = false;
+
+#if 0
        if (_flags & IsInput) {
                return;
        }
@@ -82,10 +109,33 @@ JackMidiPort::cycle_end (nframes_t nframes, nframes_t offset)
        jack_midi_clear_buffer (jack_buffer);
 
        for (MidiBuffer::iterator i = _buffer->begin(); i != _buffer->end(); ++i) {
-               const MIDI::Event& ev = *i;
+               const Evoral::Event& ev = *i;
+
                // event times should be frames, relative to cycle start
                assert(ev.time() >= 0);
                assert(ev.time() < nframes);
                jack_midi_event_write (jack_buffer, (jack_nframes_t) ev.time(), ev.buffer(), ev.size());
        }
+#endif
+}
+
+void
+JackMidiPort::flush_buffers (nframes_t nframes, nframes_t offset)
+{
+       /* FIXME: offset */
+
+       if (_flags & IsInput) {
+               return;
+       }
+
+       void* jack_buffer = jack_port_get_buffer (_port, nframes);
+
+       for (MidiBuffer::iterator i = _buffer->begin(); i != _buffer->end(); ++i) {
+               const Evoral::Event& ev = *i;
+               // event times should be frames, relative to cycle start
+               assert(ev.time() >= 0);
+               assert(ev.time() < (nframes+offset));
+               if (ev.time() >= offset)
+                       jack_midi_event_write (jack_buffer, (jack_nframes_t) ev.time(), ev.buffer(), ev.size());
+       }
 }