merge Marcel Bonnet's patches for Free-BSD

[ardour.git] / libs / fst / jackvst.h

diff --git a/libs/fst/jackvst.h b/libs/fst/jackvst.h
index abb9e22e124b94a8306eff3757de4e84057dc676..8f2618879d029e3275b35dcf63a0a3f056b5eef9 100644 (file)
--- a/libs/fst/jackvst.h
+++ b/libs/fst/jackvst.h
@@ -1,35 +1,43 @@
 #ifndef __jack_vst_h__
 #define __jack_vst_h__
 
-#include </usr/include/sys/types.h>
-#include </usr/include/sys/time.h>
+#include <sys/types.h>
+#include <sys/time.h>
 #include <jack/jack.h>
 #include <jack/ringbuffer.h>
 #include <fst.h>
+#ifdef WITH_ALSA
 #include <alsa/asoundlib.h>
+#endif
 
 typedef struct _JackVST JackVST;
 
 struct _JackVST {
     jack_client_t *client;
-    FSTHandle*     handle;
-    FST*           fst;
+    VSTHandle *    handle;
+    VSTState *     fst;
     float        **ins;
     float        **outs;
+    jack_port_t  *midi_port;
     jack_port_t  **inports;
     jack_port_t  **outports;
     void*          userdata;
     int            bypassed;
     int            muted;
+    int                   current_program;
 
-    int                   resume_called;
     /* For VST/i support */
 
+    int want_midi;
     pthread_t          midi_thread;
+#ifdef WITH_ALSA
     snd_seq_t*         seq;
+#endif WITH_ALSA
     int                midiquit;
     jack_ringbuffer_t* event_queue;
     struct VstEvents*  events;
 };
 
+#define MIDI_EVENT_MAX 1024
+
 #endif /* __jack_vst_h__ */