merge with master

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

diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc
index c2be5ca007e110db0b550429fc499ea2832658a3..184e23d1afff57016e72ff0a0472c867ebbb863a 100644 (file)
--- a/libs/ardour/buffer_set.cc
+++ b/libs/ardour/buffer_set.cc
@@ -252,40 +252,55 @@ BufferSet::get(DataType type, size_t i) const
 
 #ifdef LV2_SUPPORT
 
+void
+BufferSet::ensure_lv2_bufsize(bool input, size_t i, size_t buffer_capacity)
+{
+       assert(count().get(DataType::MIDI) > i);
+
+       LV2Buffers::value_type b     = _lv2_buffers.at(i * 2 + (input ? 0 : 1));
+       LV2_Evbuf*             evbuf = b.second;
+
+       if (lv2_evbuf_get_capacity(evbuf) >= buffer_capacity) return;
+
+       lv2_evbuf_free(b.second);
+       _lv2_buffers.at(i * 2 + (input ? 0 : 1)) =
+               std::make_pair(false, lv2_evbuf_new(
+                                       buffer_capacity,
+                                       LV2_EVBUF_EVENT,
+                                       LV2Plugin::urids.atom_Chunk,
+                                       LV2Plugin::urids.atom_Sequence));
+}
+
 LV2_Evbuf*
 BufferSet::get_lv2_midi(bool input, size_t i, bool old_api)
 {
        assert(count().get(DataType::MIDI) > i);
 
-       MidiBuffer&            mbuf  = get_midi(i);
        LV2Buffers::value_type b     = _lv2_buffers.at(i * 2 + (input ? 0 : 1));
        LV2_Evbuf*             evbuf = b.second;
-       lv2_evbuf_set_type(evbuf, old_api ? LV2_EVBUF_EVENT : LV2_EVBUF_ATOM);
 
+       lv2_evbuf_set_type(evbuf, old_api ? LV2_EVBUF_EVENT : LV2_EVBUF_ATOM);
        lv2_evbuf_reset(evbuf, input);
-       if (input) {
-               DEBUG_TRACE(PBD::DEBUG::LV2,
-                           string_compose("%1 bytes of MIDI waiting @ %2\n",
-                                          mbuf.size(), (void*) mbuf.data()));
-               
-               LV2_Evbuf_Iterator i    = lv2_evbuf_begin(evbuf);
-               const uint32_t     type = LV2Plugin::urids.midi_MidiEvent;
-               for (MidiBuffer::iterator e = mbuf.begin(); e != mbuf.end(); ++e) {
-                       const Evoral::MIDIEvent<framepos_t> ev(*e, false);
-#ifndef NDEBUG
-                       DEBUG_TRACE(PBD::DEBUG::LV2,
-                                   string_compose("\tMIDI event of size %1 @ %2\n",
-                                                  ev.size(), ev.time()));
-                       for (uint16_t x = 0; x < ev.size(); ++x) {
-                               std::stringstream ss;
-                               ss << "\t\tev[" << x << "] = " << std::hex << (int) ev.buffer()[x] << std::dec << std::endl;
-                               DEBUG_TRACE (PBD::DEBUG::LV2, ss.str());
-                       }
-#endif
-                       lv2_evbuf_write(&i, ev.time(), 0, type, ev.size(), ev.buffer());
+       return evbuf;
+}
+
+void
+BufferSet::forward_lv2_midi(LV2_Evbuf* buf, size_t i, bool purge_ardour_buffer)
+{
+       MidiBuffer& mbuf  = get_midi(i);
+       if (purge_ardour_buffer) {
+               mbuf.silence(0, 0);
+       }
+       for (LV2_Evbuf_Iterator i = lv2_evbuf_begin(buf);
+                        lv2_evbuf_is_valid(i);
+                        i = lv2_evbuf_next(i)) {
+               uint32_t frames, subframes, type, size;
+               uint8_t* data;
+               lv2_evbuf_get(i, &frames, &subframes, &type, &size, &data);
+               if (type == LV2Plugin::urids.midi_MidiEvent) {
+                       mbuf.push_back(frames, size, data);
                }
        }
-       return evbuf;
 }
 
 void
@@ -311,7 +326,10 @@ BufferSet::flush_lv2_midi(bool input, size_t i)
                        DEBUG_TRACE (PBD::DEBUG::LV2, string_compose ("\tByte[%1] = %2\n", x, (int) data[x]));
                }
 #endif
-               mbuf.push_back(frames, size, data);
+               if (type == LV2Plugin::urids.midi_MidiEvent) {
+                       // TODO: Make Ardour event buffers generic so plugins can communicate
+                       mbuf.push_back(frames, size, data);
+               }
        }
 }