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 e943a6a190ac2270ea8f997410743f2871324a51..4b7b66c659aaba01ddaa565f3a7015a21bc8648a 100644 (file)
--- a/libs/ardour/jack_midi_port.cc
+++ b/libs/ardour/jack_midi_port.cc
@@ -24,32 +24,44 @@ 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)
 {
-       if (buf) {
+       // MIDI ports always need a buffer since jack buffer format is different
+       assert(buf);
 
-               _buffer = buf;
-               _own_buffer = false;
-
-       } else {
-
-               /* data space will be provided by JACK */
-
-               _buffer = new MidiBuffer (0);
-               _own_buffer = true;
-       }
+       _buffer = buf;
+       _own_buffer = false;
 }
 
 void
-JackMidiPort::cycle_start (nframes_t nframes, nframes_t offset_ignored_but_probably_should_not_be)
+JackMidiPort::cycle_start (nframes_t nframes, nframes_t offset)
 {
+       /* FIXME: offset */
+
        _buffer->clear();
        assert(_buffer->size() == 0);
 
-       if (_flags & IsOutput) {
-               // no buffer, nothing to do
+       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);
@@ -63,18 +75,29 @@ JackMidiPort::cycle_start (nframes_t nframes, nframes_t offset_ignored_but_proba
 
                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 << "MIDIPort got " << event_count << " events." << endl;
+       /*if (_buffer->size() > 0)
+               cerr << "JackMIDIPort got " << event_count << " events (buf " << _buffer << ")" << endl;*/
+       if (nframes)
+               _has_been_mixed_down = true;
+
+       return *_buffer;
 }
 
 void
-JackMidiPort::cycle_end (nframes_t nframes, nframes_t offset_ignored_but_probably_should_not_be)
+JackMidiPort::cycle_end (nframes_t nframes, nframes_t offset)
 {
+       /* FIXME: offset */
+
+       _has_been_mixed_down = false;
+
+#if 0
        if (_flags & IsInput) {
                return;
        }
@@ -86,10 +109,33 @@ JackMidiPort::cycle_end (nframes_t nframes, nframes_t offset_ignored_but_probabl
        jack_midi_clear_buffer (jack_buffer);
 
        for (MidiBuffer::iterator i = _buffer->begin(); i != _buffer->end(); ++i) {
-               const MidiEvent& 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());
+       }
 }