X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbuffer_set.cc;h=92f5272b3b2bee945c8723eb0b2188ff58518e9b;hb=35172bb369eea6245e08b258f4a350411c20f98d;hp=2bd360b42cf02afbb8f1ccf3c2e933fe919d412b;hpb=7adac311b45037a47017786d3d2854a70650c0b0;p=ardour.git diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc index 2bd360b42c..92f5272b3b 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,10 +34,10 @@ #include "ardour/midi_buffer.h" #include "ardour/port.h" #include "ardour/port_set.h" -#include "ardour/audioengine.h" +#include "ardour/uri_map.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" @@ -77,7 +79,7 @@ BufferSet::clear() _count.reset(); _available.reset(); -#if defined WINDOWS_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; } @@ -85,11 +87,18 @@ BufferSet::clear() _vst_buffers.clear (); #endif +#ifdef LV2_SUPPORT + for (LV2Buffers::iterator i = _lv2_buffers.begin(); i != _lv2_buffers.end(); ++i) { + free ((*i).second); + } + _lv2_buffers.clear (); +#endif + } /** Set up this BufferSet so that its data structures mirror a PortSet's buffers. * This is quite expensive and not RT-safe, so it should not be called in a process context; - * get_jack_port_addresses() will fill in a structure set up by this method. + * get_backend_port_addresses() will fill in a structure set up by this method. * * XXX: this *is* called in a process context; I'm not sure quite what `should not' means above. */ @@ -113,13 +122,13 @@ BufferSet::attach_buffers (PortSet& ports) _is_mirror = true; } -/** Write the JACK port addresses from a PortSet into our data structures. This +/** Write the backend 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 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) +BufferSet::get_backend_port_addresses (PortSet& ports, framecnt_t nframes) { assert (_count == ports.count ()); assert (_available == ports.count ()); @@ -166,7 +175,7 @@ BufferSet::ensure_buffers(DataType type, size_t num_buffers, size_t buffer_capac // If there's not enough or they're too small, just nuke the whole thing and // rebuild it (so I'm lazy..) if (bufs.size() < num_buffers - || (bufs.size() > 0 && bufs[0]->capacity() < buffer_capacity)) { + || (bufs.size() > 0 && bufs[0]->capacity() < buffer_capacity)) { // Nuke it for (BufferVec::iterator i = bufs.begin(); i != bufs.end(); ++i) { @@ -188,7 +197,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, + URIMap::instance().urids.atom_Chunk, + URIMap::instance().urids.atom_Sequence))); } } #endif @@ -247,54 +260,84 @@ 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, + URIMap::instance().urids.atom_Chunk, + URIMap::instance().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 == URIMap::instance().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])); } #endif - mbuf.push_back(frames, size, data); + if (type == URIMap::instance().urids.midi_MidiEvent) { + // TODO: Make Ardour event buffers generic so plugins can communicate + mbuf.push_back(frames, size, data); + } } } @@ -433,16 +476,5 @@ BufferSet::silence (framecnt_t nframes, framecnt_t offset) } } -void -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)->set_is_silent (yn); - } - } - -} - } // namespace ARDOUR