X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbuffer_set.cc;h=55356bdecba74d26dc284f2abd63a1b5af36efce;hb=6fa6514cfdb0ce38d93b51197f599dfd091bad1d;hp=3c66bddbb792ce21b1a326394653fd349222fcd1;hpb=16db8b5972de36a640f6173aba4a8e27123fa49c;p=ardour.git diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc index 3c66bddbb7..55356bdecb 100644 --- a/libs/ardour/buffer_set.cc +++ b/libs/ardour/buffer_set.cc @@ -23,20 +23,22 @@ #include #include +#include + #include "pbd/compose.h" + #include "ardour/buffer.h" #include "ardour/buffer_set.h" #include "ardour/debug.h" #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" +#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT +#include "ardour/vestige/aeffectx.h" #endif namespace ARDOUR { @@ -75,13 +77,14 @@ BufferSet::clear() _count.reset(); _available.reset(); -#ifdef VST_SUPPORT +#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT for (VSTBuffers::iterator i = _vst_buffers.begin(); i != _vst_buffers.end(); ++i) { delete *i; } _vst_buffers.clear (); #endif + } /** Set up this BufferSet so that its data structures mirror a PortSet's buffers. @@ -93,27 +96,27 @@ BufferSet::clear() void BufferSet::attach_buffers (PortSet& ports) { - clear(); + const ChanCount& count (ports.count()); + + clear (); for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { - _buffers.push_back(BufferVec()); + _buffers.push_back (BufferVec()); BufferVec& v = _buffers[*t]; - - for (PortSet::iterator p = ports.begin(*t); p != ports.end(*t); ++p) { - assert(p->type() == *t); - v.push_back (0); - } + v.assign (count.n (*t), (Buffer*) 0); } _count = ports.count(); _available = ports.count(); + _is_mirror = true; } /** Write the JACK port addresses from a PortSet into our data structures. This * call assumes that attach_buffers() has already been called for the same PortSet. - * Does not allocate, so RT-safe. + * Does not allocate, so RT-safe BUT you can only call Port::get_buffer() from + * the process() callback tree anyway, so this has to be called in RT context. */ void BufferSet::get_jack_port_addresses (PortSet& ports, framecnt_t nframes) @@ -185,12 +188,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::_chunk_type, + LV2Plugin::_sequence_type))); } } #endif -#ifdef VST_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()) { @@ -244,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 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); } @@ -297,7 +316,7 @@ BufferSet::flush_lv2_midi(bool input, size_t i) #endif /* LV2_SUPPORT */ -#ifdef VST_SUPPORT +#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT VstEvents* BufferSet::get_vst_midi (size_t b) @@ -374,8 +393,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) { @@ -383,13 +417,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 @@ -421,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::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); } }