X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbuffer_set.cc;h=194f07e908a8368460df6f0f5c172d863fa06426;hb=fb01698450e5cb88c7e58fb3a5ebe6294731fdfe;hp=55356bdecba74d26dc284f2abd63a1b5af36efce;hpb=6fa6514cfdb0ce38d93b51197f599dfd091bad1d;p=ardour.git diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc index 55356bdecb..194f07e908 100644 --- a/libs/ardour/buffer_set.cc +++ b/libs/ardour/buffer_set.cc @@ -26,6 +26,7 @@ #include #include "pbd/compose.h" +#include "pbd/failed_constructor.h" #include "ardour/buffer.h" #include "ardour/buffer_set.h" @@ -36,9 +37,10 @@ #ifdef LV2_SUPPORT #include "ardour/lv2_plugin.h" #include "lv2_evbuf.h" +#include "ardour/uri_map.h" #endif -#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT -#include "ardour/vestige/aeffectx.h" +#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined MACVST_SUPPORT +#include "ardour/vestige/vestige.h" #endif namespace ARDOUR { @@ -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 || defined MACVST_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, samplecnt_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) { @@ -191,13 +200,13 @@ BufferSet::ensure_buffers(DataType type, size_t num_buffers, size_t buffer_capac _lv2_buffers.push_back( std::make_pair(false, lv2_evbuf_new(buffer_capacity, LV2_EVBUF_EVENT, - LV2Plugin::_chunk_type, - LV2Plugin::_sequence_type))); + URIMap::instance().urids.atom_Chunk, + URIMap::instance().urids.atom_Sequence))); } } #endif -#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT +#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined MACVST_SUPPORT // As above but for VST if (type == DataType::MIDI) { while (_vst_buffers.size() < _buffers[type].size()) { @@ -251,40 +260,55 @@ BufferSet::get(DataType type, size_t i) const #ifdef LV2_SUPPORT +void +BufferSet::ensure_lv2_bufsize(bool input, size_t i, size_t buffer_capacity) +{ + assert(count().get(DataType::MIDI) > i); + + LV2Buffers::value_type b = _lv2_buffers.at(i * 2 + (input ? 0 : 1)); + LV2_Evbuf* evbuf = b.second; + + 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); - 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); + lv2_evbuf_set_type(evbuf, old_api ? LV2_EVBUF_EVENT : LV2_EVBUF_ATOM); 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); -#ifndef NDEBUG - 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 - lv2_evbuf_write(&i, ev.time(), 0, type, ev.size(), ev.buffer()); + 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 samples, subframes, type, size; + uint8_t* data; + lv2_evbuf_get(i, &samples, &subframes, &type, &size, &data); + if (type == URIMap::instance().urids.midi_MidiEvent) { + mbuf.push_back(samples, size, data); } } - return evbuf; } void @@ -298,30 +322,34 @@ BufferSet::flush_lv2_midi(bool input, size_t i) for (LV2_Evbuf_Iterator i = lv2_evbuf_begin(evbuf); lv2_evbuf_is_valid(i); i = lv2_evbuf_next(i)) { - uint32_t frames; + uint32_t samples; uint32_t subframes; uint32_t type; uint32_t size; uint8_t* data; - lv2_evbuf_get(i, &frames, &subframes, &type, &size, &data); + lv2_evbuf_get(i, &samples, &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(samples, size, data); + } } } #endif /* LV2_SUPPORT */ -#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT +#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined MACVST_SUPPORT VstEvents* BufferSet::get_vst_midi (size_t b) { MidiBuffer& m = get_midi (b); + assert (b <= _vst_buffers.size()); VSTBuffer* vst = _vst_buffers[b]; vst->clear (); @@ -334,14 +362,25 @@ BufferSet::get_vst_midi (size_t b) } BufferSet::VSTBuffer::VSTBuffer (size_t c) - : _capacity (c) + : _events (0) + , _midi_events (0) + , _capacity (c) { - _events = static_cast (malloc (sizeof (VstEvents) + _capacity * sizeof (VstEvent *))); - _midi_events = static_cast (malloc (sizeof (VstMidiEvent) * _capacity)); + if (_capacity > 0) { + /* from `man malloc`: "If size is 0, then malloc() returns either NULL, or a + * unique pointer value that can later be successfully passed to free()." + * + * The latter will cause trouble here. + */ + _events = static_cast (malloc (sizeof (VstEvents) + _capacity * sizeof (VstEvent *))); + _midi_events = static_cast (malloc (sizeof (VstMidiEvent) * _capacity)); + } if (_events == 0 || _midi_events == 0) { free (_events); free (_midi_events); + _events = 0; + _midi_events = 0; throw failed_constructor (); } @@ -362,7 +401,7 @@ BufferSet::VSTBuffer::clear () } void -BufferSet::VSTBuffer::push_back (Evoral::MIDIEvent const & ev) +BufferSet::VSTBuffer::push_back (Evoral::Event const & ev) { if (ev.size() > 3) { /* XXX: this will silently drop MIDI messages longer than 3 bytes, so @@ -370,15 +409,18 @@ BufferSet::VSTBuffer::push_back (Evoral::MIDIEvent const & ev) */ return; } - int const n = _events->numEvents; - assert (n < (int) _capacity); + uint32_t const n = _events->numEvents; + assert (n < _capacity); + if (n >= _capacity) { + return; + } _events->events[n] = reinterpret_cast (_midi_events + n); VstMidiEvent* v = reinterpret_cast (_events->events[n]); v->type = kVstMidiType; v->byteSize = sizeof (VstMidiEvent); - v->deltaFrames = ev.time (); + v->deltaSamples = ev.time (); v->flags = 0; v->detune = 0; @@ -397,7 +439,7 @@ BufferSet::VSTBuffer::push_back (Evoral::MIDIEvent const & ev) /** Copy buffers of one type from `in' to this BufferSet */ void -BufferSet::read_from (const BufferSet& in, framecnt_t nframes, DataType type) +BufferSet::read_from (const BufferSet& in, samplecnt_t nframes, DataType type) { assert (available().get (type) >= in.count().get (type)); @@ -411,7 +453,7 @@ BufferSet::read_from (const BufferSet& in, framecnt_t nframes, DataType type) /** Copy buffers of all types from `in' to this BufferSet */ void -BufferSet::read_from (const BufferSet& in, framecnt_t nframes) +BufferSet::read_from (const BufferSet& in, samplecnt_t nframes) { assert(available() >= in.count()); @@ -422,7 +464,7 @@ BufferSet::read_from (const BufferSet& in, framecnt_t nframes) } void -BufferSet::merge_from (const BufferSet& in, framecnt_t nframes) +BufferSet::merge_from (const BufferSet& in, samplecnt_t nframes) { /* merge all input buffers into out existing buffers. @@ -440,7 +482,7 @@ BufferSet::merge_from (const BufferSet& in, framecnt_t nframes) } void -BufferSet::silence (framecnt_t nframes, framecnt_t offset) +BufferSet::silence (samplecnt_t nframes, samplecnt_t offset) { for (std::vector::iterator i = _buffers.begin(); i != _buffers.end(); ++i) { for (BufferVec::iterator b = i->begin(); b != i->end(); ++b) { @@ -449,16 +491,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