better error msg about autoloop location

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

diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc
index 2bd360b42cf02afbb8f1ccf3c2e933fe919d412b..1f8317ffe26a6a3240f21b9d3af77d224d04e7d2 100644 (file)
--- a/libs/ardour/buffer_set.cc
+++ b/libs/ardour/buffer_set.cc
@@ -23,8 +23,10 @@
 
 #include <iostream>
 #include <algorithm>
+#include <sstream>
 
 #include "pbd/compose.h"
+#include "pbd/failed_constructor.h"
 
 #include "ardour/buffer.h"
 #include "ardour/buffer_set.h"
@@ -32,10 +34,9 @@
 #include "ardour/midi_buffer.h"
 #include "ardour/port.h"
 #include "ardour/port_set.h"
-#include "ardour/audioengine.h"
 #ifdef LV2_SUPPORT
 #include "ardour/lv2_plugin.h"
-#include "ardour/lv2_event_buffer.h"
+#include "lv2_evbuf.h"
 #endif
 #if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT
 #include "ardour/vestige/aeffectx.h"
@@ -188,7 +189,11 @@ BufferSet::ensure_buffers(DataType type, size_t num_buffers, size_t buffer_capac
        // in both directions (input & output, out-of-place)
        if (type == DataType::MIDI && _lv2_buffers.size() < _buffers[type].size() * 2 + 1) {
                while (_lv2_buffers.size() < _buffers[type].size() * 2) {
-                       _lv2_buffers.push_back(std::make_pair(false, new LV2EventBuffer(buffer_capacity)));
+                       _lv2_buffers.push_back(
+                               std::make_pair(false, lv2_evbuf_new(buffer_capacity,
+                                                                   LV2_EVBUF_EVENT,
+                                                                   LV2Plugin::urids.atom_Chunk,
+                                                                   LV2Plugin::urids.atom_Sequence)));
                }
        }
 #endif
@@ -247,54 +252,46 @@ BufferSet::get(DataType type, size_t i) const
 
 #ifdef LV2_SUPPORT
 
-LV2EventBuffer&
-BufferSet::get_lv2_midi(bool input, size_t i)
+LV2_Evbuf*
+BufferSet::get_lv2_midi(bool input, size_t i, bool old_api)
 {
-       assert (count().get(DataType::MIDI) > i);
+       assert(count().get(DataType::MIDI) > i);
 
-       MidiBuffer& mbuf = get_midi(i);
-       LV2Buffers::value_type b = _lv2_buffers.at(i * 2 + (input ? 0 : 1));
-       LV2EventBuffer* ebuf = b.second;
+       LV2Buffers::value_type b     = _lv2_buffers.at(i * 2 + (input ? 0 : 1));
+       LV2_Evbuf*             evbuf = b.second;
 
-       ebuf->reset();
-       if (input) {
-               for (MidiBuffer::iterator e = mbuf.begin(); e != mbuf.end(); ++e) {
-                       const Evoral::MIDIEvent<framepos_t> ev(*e, false);
-                       uint32_t type = LV2Plugin::midi_event_type();
-#ifndef NDEBUG
-                       DEBUG_TRACE (PBD::DEBUG::LV2, string_compose ("(FLUSH) MIDI event of size %1\n", ev.size()));
-                       for (uint16_t x = 0; x < ev.size(); ++x) {
-                               DEBUG_TRACE (PBD::DEBUG::LV2, string_compose ("\tByte[%1] = %2\n", x, (int) ev.buffer()[x]));
-                       }
-#endif
-                       ebuf->append(ev.time(), 0, type, ev.size(), ev.buffer());
-               }
-       }
-       return *ebuf;
+       lv2_evbuf_set_type(evbuf, old_api ? LV2_EVBUF_EVENT : LV2_EVBUF_ATOM);
+       lv2_evbuf_reset(evbuf, input);
+       return evbuf;
 }
 
 void
 BufferSet::flush_lv2_midi(bool input, size_t i)
 {
-       MidiBuffer& mbuf = get_midi(i);
-       LV2Buffers::value_type b = _lv2_buffers.at(i * 2 + (input ? 0 : 1));
-       LV2EventBuffer* ebuf = b.second;
+       MidiBuffer&            mbuf  = get_midi(i);
+       LV2Buffers::value_type b     = _lv2_buffers.at(i * 2 + (input ? 0 : 1));
+       LV2_Evbuf*             evbuf = b.second;
 
        mbuf.silence(0, 0);
-       for (ebuf->rewind(); ebuf->is_valid(); ebuf->increment()) {
+       for (LV2_Evbuf_Iterator i = lv2_evbuf_begin(evbuf);
+            lv2_evbuf_is_valid(i);
+            i = lv2_evbuf_next(i)) {
                uint32_t frames;
                uint32_t subframes;
-               uint16_t type;
-               uint16_t size;
+               uint32_t type;
+               uint32_t size;
                uint8_t* data;
-               ebuf->get_event(&frames, &subframes, &type, &size, &data);
+               lv2_evbuf_get(i, &frames, &subframes, &type, &size, &data);
 #ifndef NDEBUG
                DEBUG_TRACE (PBD::DEBUG::LV2, string_compose ("(FLUSH) MIDI event of size %1\n", size));
                for (uint16_t x = 0; x < size; ++x) {
                        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);
+               }
        }
 }