X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbuffer_set.cc;h=caf6d7e8d2e8fcd8b8570bae203f24b54e5b94a8;hb=bc3e1a212250a67e53e86c972287a275834a967a;hp=159a24c217c9fb105c64fa851c68900a26a6d4ef;hpb=dd7caa01654dc58d3259eeed0e0f2b8ddb293b66;p=ardour.git

diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc
index 159a24c217..caf6d7e8d2 100644
--- a/libs/ardour/buffer_set.cc
+++ b/libs/ardour/buffer_set.cc
@@ -23,18 +23,23 @@
 
 #include <iostream>
 #include <algorithm>
+#include <sstream>
+
+#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,46 +78,49 @@ 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
+
 }
 
 /** 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)
 {
-	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 (0);
-		}
+		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.
+ *  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, framecnt_t offset)
+BufferSet::get_jack_port_addresses (PortSet& ports, framecnt_t nframes)
 {
 	assert (_count == ports.count ());
 	assert (_available == ports.count ());
@@ -127,7 +135,7 @@ BufferSet::get_jack_port_addresses (PortSet& ports, framecnt_t nframes, framecnt
 
 		int i = 0;
 		for (PortSet::iterator p = ports.begin(*t); p != ports.end(*t); ++p) {
-			v[i] = &p->get_buffer (nframes, offset);
+			v[i] = &p->get_buffer (nframes);
 			++i;
 		}
 	}
@@ -176,7 +184,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) {
@@ -186,14 +194,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);
@@ -238,22 +246,31 @@ 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;
 
 	ebuf->reset();
 	if (input) {
+		DEBUG_TRACE (PBD::DEBUG::LV2, string_compose ("%1 bytes of MIDI waiting @ %2\n", mbuf.size(), (void*) mbuf.data()));
 		for (MidiBuffer::iterator e = mbuf.begin(); e != mbuf.end(); ++e) {
 			const Evoral::MIDIEvent<framepos_t> ev(*e, false);
 			uint32_t type = LV2Plugin::midi_event_type();
+#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\tByte[" << x << "] = " << std::hex << (int) ev.buffer()[x] << std::dec << std::endl;
+				DEBUG_TRACE (PBD::DEBUG::LV2, ss.str());
+			}
+#endif
 			ebuf->append(ev.time(), 0, type, ev.size(), ev.buffer());
 		}
 	}
@@ -275,13 +292,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)
@@ -294,7 +317,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();
 }
 
@@ -340,7 +363,7 @@ BufferSet::VSTBuffer::push_back (Evoral::MIDIEvent<framepos_t> const & ev)
 
 	_events->events[n] = reinterpret_cast<VstEvent*> (_midi_events + n);
 	VstMidiEvent* v = reinterpret_cast<VstMidiEvent*> (_events->events[n]);
-	
+
 	v->type = kVstMidiType;
 	v->byteSize = sizeof (VstMidiEvent);
 	v->deltaFrames = ev.time ();
@@ -358,8 +381,23 @@ BufferSet::VSTBuffer::push_back (Evoral::MIDIEvent<framepos_t> 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)
 {
@@ -367,13 +405,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
@@ -405,14 +438,14 @@ BufferSet::silence (framecnt_t nframes, framecnt_t offset)
 }
 
 void
-BufferSet::is_silent (bool yn)
+BufferSet::set_is_silent (bool yn)
 {
 	for (std::vector<BufferVec>::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