Support LV2 atom sequence ports alongside old event ports.

[ardour.git] / libs / ardour / ardour / buffer_set.h

diff --git a/libs/ardour/ardour/buffer_set.h b/libs/ardour/ardour/buffer_set.h
index 05e0e42d1f142a8a7eb65dd8a7419f79ad1068e2..5049eda70a36f149f76d8394ad396b816cb1e38e 100644 (file)
--- a/libs/ardour/ardour/buffer_set.h
+++ b/libs/ardour/ardour/buffer_set.h
@@ -29,11 +29,17 @@
 #include "ardour/data_type.h"
 #include "ardour/types.h"
 
-#ifdef VST_SUPPORT
+#if defined VST_SUPPORT || defined LXVST_SUPPORT
 #include "evoral/MIDIEvent.hpp"
-struct VstEvents;
-struct VstMidiEvent;
-#endif 
+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 +47,6 @@ class Buffer;
 class AudioBuffer;
 class MidiBuffer;
 class PortSet;
-#ifdef LV2_SUPPORT
-class LV2EventBuffer;
-#endif
 
 /** A set of buffers of various types.
  *
@@ -83,7 +86,7 @@ public:
        const ChanCount& count() const { return _count; }
        ChanCount&       count()       { return _count; }
 
-       void is_silent(bool yn);
+       void set_is_silent(bool yn);
        void silence (framecnt_t nframes, framecnt_t offset);
        bool is_mirror() const { return _is_mirror; }
 
@@ -111,18 +114,22 @@ 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);
+        * passed to get_midi), translation back and forth will happen as needed.
+        * If atom_type is 0 the returned buffer will be in the old event API
+        * format.  Otherwise, atom_type must be the URID for atom:Sequence.
+        */
+       LV2_Evbuf* get_lv2_midi(bool input, size_t i, uint32_t atom_type);
 
        /** Flush modified LV2 event output buffers back to Ardour buffers */
        void flush_lv2_midi(bool input, size_t i);
 #endif
 
-#ifdef VST_SUPPORT
+#if defined VST_SUPPORT || defined LXVST_SUPPORT
        VstEvents* get_vst_midi (size_t);
-#endif 
+#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 +179,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 VST_SUPPORT || defined LXVST_SUPPORT
        class VSTBuffer {
        public:
                VSTBuffer (size_t);
@@ -191,15 +198,15 @@ private:
        private:
                /* prevent copy construction */
                VSTBuffer (VSTBuffer const &);
-               
+
                VstEvents* _events; /// the parent VSTEvents struct
                VstMidiEvent* _midi_events; ///< storage area for VSTMidiEvents
                size_t _capacity;
        };
-       
+
        typedef std::vector<VSTBuffer*> VSTBuffers;
        VSTBuffers _vst_buffers;
-#endif 
+#endif
 
        /// Use counts (there may be more actual buffers than this)
        ChanCount _count;