diff options
Diffstat (limited to 'libs/ardour/buffer_set.cc')
| -rw-r--r-- | libs/ardour/buffer_set.cc | 81 |
1 files changed, 61 insertions, 20 deletions
diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc index dfc607ec03..c75a15c074 100644 --- a/libs/ardour/buffer_set.cc +++ b/libs/ardour/buffer_set.cc @@ -18,10 +18,14 @@ #include <iostream> #include <algorithm> -#include "ardour/buffer_set.h" #include "ardour/buffer.h" +#include "ardour/buffer_set.h" +#include "ardour/lv2_event_buffer.h" +#include "ardour/lv2_plugin.h" +#include "ardour/midi_buffer.h" #include "ardour/port.h" #include "ardour/port_set.h" +#include "ardour/audioengine.h" namespace ARDOUR { @@ -29,8 +33,9 @@ namespace ARDOUR { BufferSet::BufferSet() : _is_mirror(false) { - for (size_t i=0; i < DataType::num_types; ++i) - _buffers.push_back( BufferVec() ); + for (size_t i=0; i < DataType::num_types; ++i) { + _buffers.push_back(BufferVec()); + } _count.reset(); _available.reset(); @@ -81,15 +86,6 @@ BufferSet::attach_buffers(PortSet& ports, nframes_t nframes, nframes_t offset) _is_mirror = true; } -void -BufferSet::ensure_buffers(const ChanCount& count, size_t buffer_capacity) -{ - for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { - ensure_buffers(*t, count.get(*t), buffer_capacity); - } -} - - /** Ensure that there are @a num_buffers buffers of type @a type available, * each of size at least @a buffer_size */ @@ -98,17 +94,10 @@ BufferSet::ensure_buffers(DataType type, size_t num_buffers, size_t buffer_capac { assert(type != DataType::NIL); assert(type < _buffers.size()); - assert(buffer_capacity > 0); if (num_buffers == 0) return; - // FIXME: Kludge to make MIDI buffers larger (size is bytes, not frames) - // See MidiPort::MidiPort - // We probably need a map<DataType, size_t> parameter for capacity - if (type == DataType::MIDI) - buffer_capacity *= 8; - // The vector of buffers of the type we care about BufferVec& bufs = _buffers[type]; @@ -131,13 +120,21 @@ BufferSet::ensure_buffers(DataType type, size_t num_buffers, size_t buffer_capac bufs.clear(); // Rebuild it - for (size_t i=0; i < num_buffers; ++i) { + for (size_t i = 0; i < num_buffers; ++i) { bufs.push_back(Buffer::create(type, buffer_capacity)); } _available.set(type, num_buffers); } + // 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) { + while (_lv2_buffers.size() < _buffers[type].size() * 2) { + _lv2_buffers.push_back(std::make_pair(false, new LV2EventBuffer(buffer_capacity))); + } + } + // Post-conditions assert(bufs[0]->type() == type); assert(bufs.size() >= num_buffers); @@ -156,6 +153,50 @@ BufferSet::buffer_capacity(DataType type) const return _buffers[type][0]->capacity(); } +Buffer& +BufferSet::get(DataType type, size_t i) +{ + assert(i <= _count.get(type)); + return *_buffers[type][i]; +} + +LV2EventBuffer& +BufferSet::get_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; + + ebuf->reset(); + if (input) { + for (MidiBuffer::iterator e = mbuf.begin(); e != mbuf.end(); ++e) { + const Evoral::MIDIEvent<nframes_t> ev(*e, false); + uint32_t type = LV2Plugin::midi_event_type(); + ebuf->append(ev.time(), 0, type, ev.size(), ev.buffer()); + } + } + 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; + + mbuf.silence(0, 0); + for (ebuf->rewind(); ebuf->is_valid(); ebuf->increment()) { + uint32_t frames; + uint32_t subframes; + uint16_t type; + uint16_t size; + uint8_t* data; + ebuf->get_event(&frames, &subframes, &type, &size, &data); + mbuf.push_back(frames, size, data); + } +} + // FIXME: make 'in' const void BufferSet::read_from (BufferSet& in, nframes_t nframes) |