X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbuffer_set.cc;h=184e23d1afff57016e72ff0a0472c867ebbb863a;hb=f00b3b7f111e36537d773daef0ae77b03d11f82f;hp=6061d360f9bba6ddfa1a683fe0d48555fa7a2eb6;hpb=d4433b9ab384196bb5b8876890863d7939339ee2;p=ardour.git diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc index 6061d360f9..184e23d1af 100644 --- a/libs/ardour/buffer_set.cc +++ b/libs/ardour/buffer_set.cc @@ -23,8 +23,10 @@ #include #include +#include #include "pbd/compose.h" +#include "pbd/failed_constructor.h" #include "ardour/buffer.h" #include "ardour/buffer_set.h" @@ -32,16 +34,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 VST_SUPPORT -#include "vestige/aeffectx.h" -#endif - -#ifdef LXVST_SUPPORT +#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT #include "ardour/vestige/aeffectx.h" #endif @@ -81,7 +78,7 @@ BufferSet::clear() _count.reset(); _available.reset(); -#if defined VST_SUPPORT || defined LXVST_SUPPORT +#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT for (VSTBuffers::iterator i = _vst_buffers.begin(); i != _vst_buffers.end(); ++i) { delete *i; } @@ -192,12 +189,16 @@ 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 -#if defined VST_SUPPORT || defined LXVST_SUPPORT +#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT // As above but for VST if (type == DataType::MIDI) { while (_vst_buffers.size() < _buffers[type].size()) { @@ -251,60 +252,90 @@ BufferSet::get(DataType type, size_t i) const #ifdef LV2_SUPPORT -LV2EventBuffer& -BufferSet::get_lv2_midi(bool input, size_t i) +void +BufferSet::ensure_lv2_bufsize(bool input, size_t i, size_t buffer_capacity) { - 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 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()); + 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); + + 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_reset(evbuf, input); + 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 *ebuf; } 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); + if (type == LV2Plugin::urids.midi_MidiEvent) { + // TODO: Make Ardour event buffers generic so plugins can communicate + mbuf.push_back(frames, size, data); + } } } #endif /* LV2_SUPPORT */ -#if defined VST_SUPPORT || defined LXVST_SUPPORT +#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT VstEvents* BufferSet::get_vst_midi (size_t b) @@ -381,8 +412,23 @@ BufferSet::VSTBuffer::push_back (Evoral::MIDIEvent const & ev) _events->numEvents++; } -#endif /* VST_SUPPORT */ +#endif /* WINDOWS_VST_SUPPORT */ + +/** Copy buffers of one type from `in' to this BufferSet */ +void +BufferSet::read_from (const BufferSet& in, framecnt_t nframes, DataType type) +{ + assert (available().get (type) >= in.count().get (type)); + + BufferSet::iterator o = begin (type); + for (BufferSet::const_iterator i = in.begin (type); i != in.end (type); ++i, ++o) { + o->read_from (*i, nframes); + } + + _count.set (type, in.count().get (type)); +} +/** Copy buffers of all types from `in' to this BufferSet */ void BufferSet::read_from (const BufferSet& in, framecnt_t nframes) { @@ -390,13 +436,8 @@ BufferSet::read_from (const BufferSet& in, framecnt_t nframes) // Copy all buffers 1:1 for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { - BufferSet::iterator o = begin(*t); - for (BufferSet::const_iterator i = in.begin(*t); i != in.end(*t); ++i, ++o) { - o->read_from (*i, nframes); - } + read_from (in, nframes, *t); } - - set_count(in.count()); } void @@ -428,11 +469,11 @@ BufferSet::silence (framecnt_t nframes, framecnt_t offset) } void -BufferSet::is_silent (bool yn) +BufferSet::set_is_silent (bool yn) { for (std::vector::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); } }