X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fbuffer_set.h;h=9ea6ab7d6ad1d3620d347fb4eea78971d53fb481;hb=74a604d261b1ecb0f20ee0c69aef7648da3a1d86;hp=724eef6a24e0fcfe470b1f2b08e548381f89e47d;hpb=a473d630eb165272992e90f8d854b1d66ec0be63;p=ardour.git

diff --git a/libs/ardour/ardour/buffer_set.h b/libs/ardour/ardour/buffer_set.h
index 724eef6a24..9ea6ab7d6a 100644
--- a/libs/ardour/ardour/buffer_set.h
+++ b/libs/ardour/ardour/buffer_set.h
@@ -27,12 +27,19 @@
 #include <vector>
 #include "ardour/chan_count.h"
 #include "ardour/data_type.h"
+#include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 
-#ifdef VST_SUPPORT
+#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT
 #include "evoral/MIDIEvent.hpp"
-struct VstEvents;
-struct VstMidiEvent;
+struct _VstEvents;
+typedef struct _VstEvents VstEvents;
+struct _VstMidiEvent;
+typedef struct _VstMidiEvent VstMidiEvent;
+#endif
+
+#ifdef LV2_SUPPORT
+typedef struct LV2_Evbuf_Impl LV2_Evbuf;
 #endif
 
 namespace ARDOUR {
@@ -41,9 +48,6 @@ class Buffer;
 class AudioBuffer;
 class MidiBuffer;
 class PortSet;
-#ifdef LV2_SUPPORT
-class LV2EventBuffer;
-#endif
 
 /** A set of buffers of various types.
  *
@@ -58,7 +62,7 @@ class LV2EventBuffer;
  * others the form of their output (eg what they did to the BufferSet).
  * Setting the use counts is realtime safe.
  */
-class BufferSet
+class LIBARDOUR_API BufferSet
 {
 public:
 	BufferSet();
@@ -67,7 +71,7 @@ public:
 	void clear();
 
 	void attach_buffers (PortSet& ports);
-	void get_jack_port_addresses (PortSet &, framecnt_t);
+	void get_backend_port_addresses (PortSet &, framecnt_t);
 
 	/* the capacity here is a size_t and has a different interpretation depending
 	   on the DataType of the buffers. for audio, its a frame count. for MIDI
@@ -83,7 +87,6 @@ public:
 	const ChanCount& count() const { return _count; }
 	ChanCount&       count()       { return _count; }
 
-	void is_silent(bool yn);
 	void silence (framecnt_t nframes, framecnt_t offset);
 	bool is_mirror() const { return _is_mirror; }
 
@@ -109,20 +112,30 @@ public:
 	}
 
 #ifdef LV2_SUPPORT
-	/** Get a MIDI buffer translated into an LV2 MIDI buffer for use with plugins.
-	 * The index here corresponds directly to MIDI buffer numbers (i.e. the index
-	 * passed to get_midi), translation back and forth will happen as needed */
-	LV2EventBuffer& get_lv2_midi(bool input, size_t i);
+	/** Get a MIDI buffer translated into an LV2 MIDI buffer for use with
+	 * plugins.  The index here corresponds directly to MIDI buffer numbers
+	 * (i.e. the index passed to get_midi), translation back and forth will
+	 * happen as needed.  If old_api is true, the returned buffer will be in
+	 * old event format.  Otherwise it will be in new atom sequence format.
+	 */
+	LV2_Evbuf* get_lv2_midi(bool input, size_t i, bool old_api);
+
+	/** ensure minimum size of LV2 Atom port buffer */
+	void ensure_lv2_bufsize(bool input, size_t i, size_t buffer_capacity);
 
 	/** Flush modified LV2 event output buffers back to Ardour buffers */
 	void flush_lv2_midi(bool input, size_t i);
+
+	/** Forward plugin MIDI output to to Ardour buffers */
+	void forward_lv2_midi(LV2_Evbuf*, size_t, bool purge_ardour_buffer = true);
 #endif
 
-#ifdef VST_SUPPORT
+#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT
 	VstEvents* get_vst_midi (size_t);
 #endif
 
 	void read_from(const BufferSet& in, framecnt_t nframes);
+	void read_from(const BufferSet& in, framecnt_t nframes, DataType);
 	void merge_from(const BufferSet& in, framecnt_t nframes);
 
 	template <typename BS, typename B>
@@ -172,11 +185,11 @@ private:
 
 #ifdef LV2_SUPPORT
 	/// LV2 MIDI buffers (for conversion to/from MIDI buffers)
-	typedef std::vector< std::pair<bool, LV2EventBuffer*> > LV2Buffers;
+	typedef std::vector< std::pair<bool, LV2_Evbuf*> > LV2Buffers;
 	LV2Buffers _lv2_buffers;
 #endif
 
-#ifdef VST_SUPPORT
+#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT
 	class VSTBuffer {
 	public:
 		VSTBuffer (size_t);