Remove over 500 unnecessary includes (including 54 of session.h).

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

diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc
index b57047dfee9a512774312d29310c2355b55f3459..55356bdecba74d26dc284f2abd63a1b5af36efce 100644 (file)
--- a/libs/ardour/buffer_set.cc
+++ b/libs/ardour/buffer_set.cc
@@ -23,6 +23,7 @@
 
 #include <iostream>
 #include <algorithm>
+#include <sstream>
 
 #include "pbd/compose.h"
 
@@ -32,16 +33,11 @@
 #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
-#ifdef WINDOWS_VST_SUPPORT
-#include "vestige/aeffectx.h"
-#endif
-
-#ifdef LXVST_SUPPORT
+#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT
 #include "ardour/vestige/aeffectx.h"
 #endif
 
@@ -192,7 +188,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::_chunk_type,
+                                                                   LV2Plugin::_sequence_type)));
                }
        }
 #endif
@@ -251,52 +251,64 @@ 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;
+       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);
 
-       ebuf->reset();
+       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::midi_event_type(old_api);
                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]));
-                        }
+                       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
-                       ebuf->append(ev.time(), 0, type, ev.size(), ev.buffer());
+                       lv2_evbuf_write(&i, ev.time(), 0, type, ev.size(), ev.buffer());
                }
        }
-       return *ebuf;
+       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]));
-                }
+               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);
        }
@@ -438,11 +450,11 @@ BufferSet::silence (framecnt_t nframes, framecnt_t offset)
 }
 
 void
-BufferSet::is_silent (bool yn)
+BufferSet::set_is_silent (bool yn)
 {
        for (std::vector<BufferVec>::iterator i = _buffers.begin(); i != _buffers.end(); ++i) {
                for (BufferVec::iterator b = i->begin(); b != i->end(); ++b) {
-                       (*b)->is_silent (yn);
+                       (*b)->set_is_silent (yn);
                }
        }