X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbuffer_set.cc;h=194f07e908a8368460df6f0f5c172d863fa06426;hb=fb01698450e5cb88c7e58fb3a5ebe6294731fdfe;hp=9db99d20ce520eeced0825e2614b40a73ac1fe12;hpb=316973d7c7bc99bfef6367d42009883d0de2abbd;p=ardour.git diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc index 9db99d20ce..194f07e908 100644 --- a/libs/ardour/buffer_set.cc +++ b/libs/ardour/buffer_set.cc @@ -37,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 { @@ -78,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; } @@ -86,6 +87,13 @@ 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. @@ -120,7 +128,7 @@ BufferSet::attach_buffers (PortSet& ports) * the process() callback tree anyway, so this has to be called in RT context. */ void -BufferSet::get_backend_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 ()); @@ -179,7 +187,7 @@ BufferSet::ensure_buffers(DataType type, size_t num_buffers, size_t buffer_capac for (size_t i = 0; i < num_buffers; ++i) { bufs.push_back(Buffer::create(type, buffer_capacity)); } - + _available.set(type, num_buffers); _count.set (type, num_buffers); } @@ -192,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::urids.atom_Chunk, - LV2Plugin::urids.atom_Sequence))); + 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()) { @@ -267,8 +275,8 @@ BufferSet::ensure_lv2_bufsize(bool input, size_t i, size_t buffer_capacity) std::make_pair(false, lv2_evbuf_new( buffer_capacity, LV2_EVBUF_EVENT, - LV2Plugin::urids.atom_Chunk, - LV2Plugin::urids.atom_Sequence)); + URIMap::instance().urids.atom_Chunk, + URIMap::instance().urids.atom_Sequence)); } LV2_Evbuf* @@ -294,11 +302,11 @@ BufferSet::forward_lv2_midi(LV2_Evbuf* buf, size_t i, bool purge_ardour_buffer) 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; + uint32_t samples, 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); + lv2_evbuf_get(i, &samples, &subframes, &type, &size, &data); + if (type == URIMap::instance().urids.midi_MidiEvent) { + mbuf.push_back(samples, size, data); } } } @@ -314,33 +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 - if (type == LV2Plugin::urids.midi_MidiEvent) { + if (type == URIMap::instance().urids.midi_MidiEvent) { // TODO: Make Ardour event buffers generic so plugins can communicate - mbuf.push_back(frames, size, data); + 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 (); @@ -353,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 (); } @@ -381,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 @@ -389,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; @@ -416,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)); @@ -430,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()); @@ -441,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. @@ -459,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) {