Merge event control lists when disconnecting a master-ctrl

[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 5f8553218babeab8f02f2853af28f2728d8532e0..a4fa53e2fc34d37a145dafa5efd73cc15ae538cb 100644 (file)
--- a/libs/ardour/ardour/buffer_set.h
+++ b/libs/ardour/ardour/buffer_set.h
@@ -27,10 +27,11 @@
 #include <vector>
 #include "ardour/chan_count.h"
 #include "ardour/data_type.h"
+#include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 
-#if defined VST_SUPPORT || defined LXVST_SUPPORT
-#include "evoral/MIDIEvent.hpp"
+#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined MACVST_SUPPORT
+#include "evoral/Event.hpp"
 struct _VstEvents;
 typedef struct _VstEvents VstEvents;
 struct _VstMidiEvent;
@@ -61,7 +62,7 @@ class PortSet;
  * 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();
@@ -129,7 +130,7 @@ public:
        void forward_lv2_midi(LV2_Evbuf*, size_t, bool purge_ardour_buffer = true);
 #endif
 
-#if defined VST_SUPPORT || defined LXVST_SUPPORT
+#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined MACVST_SUPPORT
        VstEvents* get_vst_midi (size_t);
 #endif
 
@@ -188,14 +189,14 @@ private:
        LV2Buffers _lv2_buffers;
 #endif
 
-#if defined VST_SUPPORT || defined LXVST_SUPPORT
+#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT || defined MACVST_SUPPORT
        class VSTBuffer {
        public:
                VSTBuffer (size_t);
                ~VSTBuffer ();
 
                void clear ();
-               void push_back (Evoral::MIDIEvent<framepos_t> const &);
+               void push_back (Evoral::Event<framepos_t> const &);
                VstEvents* events () const {
                        return _events;
                }