X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbuffer_set.cc;h=2bd360b42cf02afbb8f1ccf3c2e933fe919d412b;hb=39f765614a7964e07c55a57ba854f8524807d6cb;hp=c60c0ac2b91fbe20372822d6aba5df78b42a9512;hpb=73192bc1a7ea55fa1864dc3826845b15c00dd2ec;p=ardour.git diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc index c60c0ac2b9..2bd360b42c 100644 --- a/libs/ardour/buffer_set.cc +++ b/libs/ardour/buffer_set.cc @@ -23,18 +23,22 @@ #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 HAVE_SLV2 +#ifdef LV2_SUPPORT #include "ardour/lv2_plugin.h" #include "ardour/lv2_event_buffer.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 { @@ -73,38 +77,69 @@ 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 +#endif + } -/** Make this BufferSet a direct mirror of a PortSet's buffers. +/** 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. + * + * XXX: this *is* called in a process context; I'm not sure quite what `should not' means above. */ void -BufferSet::attach_buffers (PortSet& ports, framecnt_t nframes, framecnt_t offset) +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(&(p->get_buffer(nframes, offset))); - } + 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 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) +{ + assert (_count == ports.count ()); + assert (_available == ports.count ()); + assert (_is_mirror); + + assert (_buffers.size() == DataType::num_types); + + for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { + BufferVec& v = _buffers[*t]; + + assert (v.size() == ports.num_ports (*t)); + + int i = 0; + for (PortSet::iterator p = ports.begin(*t); p != ports.end(*t); ++p) { + v[i] = &p->get_buffer (nframes); + ++i; + } + } +} + /** Ensure that there are @a num_buffers buffers of type @a type available, * each of size at least @a buffer_size */ @@ -148,7 +183,7 @@ BufferSet::ensure_buffers(DataType type, size_t num_buffers, size_t buffer_capac _count.set (type, num_buffers); } -#ifdef HAVE_SLV2 +#ifdef LV2_SUPPORT // Ensure enough low level MIDI format buffers are available for conversion // in both directions (input & output, out-of-place) if (type == DataType::MIDI && _lv2_buffers.size() < _buffers[type].size() * 2 + 1) { @@ -158,14 +193,14 @@ BufferSet::ensure_buffers(DataType type, size_t num_buffers, size_t buffer_capac } #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()) { _vst_buffers.push_back (new VSTBuffer (buffer_capacity)); } } -#endif +#endif // Post-conditions assert(bufs[0]->type() == type); @@ -210,13 +245,13 @@ BufferSet::get(DataType type, size_t i) const return *_buffers[type][i]; } -#ifdef HAVE_SLV2 +#ifdef LV2_SUPPORT LV2EventBuffer& BufferSet::get_lv2_midi(bool input, size_t 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; @@ -226,6 +261,12 @@ BufferSet::get_lv2_midi(bool input, size_t i) 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()); } } @@ -247,13 +288,19 @@ BufferSet::flush_lv2_midi(bool input, size_t i) uint16_t size; uint8_t* data; ebuf->get_event(&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); } } -#endif /* HAVE_SLV2 */ +#endif /* LV2_SUPPORT */ -#ifdef VST_SUPPORT +#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT VstEvents* BufferSet::get_vst_midi (size_t b) @@ -266,7 +313,7 @@ BufferSet::get_vst_midi (size_t b) for (MidiBuffer::iterator i = m.begin(); i != m.end(); ++i) { vst->push_back (*i); } - + return vst->events(); } @@ -312,7 +359,7 @@ BufferSet::VSTBuffer::push_back (Evoral::MIDIEvent const & ev) _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 (); @@ -330,8 +377,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) { @@ -339,13 +401,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 @@ -377,14 +434,14 @@ 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); } } - + } } // namespace ARDOUR