diff options
author | Robin Gareus <robin@gareus.org> | 2013-01-04 17:36:52 +0000 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2013-01-04 17:36:52 +0000 |
commit | bb3690db586d092e70732d6546969a8828aadcfe (patch) | |
tree | 4a1669d778a847469a3a301b80b642fa8f4b85f8 /libs/fst | |
parent | 2c95bfcd46d9093f665bbedfad3cdf73e45f3d35 (diff) |
merge Marcel Bonnet's patches for Free-BSD
(may need further cleanup:
compare with timbyr's windows patch,
verify fst/vsti + ALSA)
git-svn-id: svn://localhost/ardour2/branches/3.0@13774 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/fst')
-rw-r--r-- | libs/fst/jackvst.h | 4 | ||||
-rw-r--r-- | libs/fst/vsti.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libs/fst/jackvst.h b/libs/fst/jackvst.h index b496f68493..8f2618879d 100644 --- a/libs/fst/jackvst.h +++ b/libs/fst/jackvst.h @@ -6,7 +6,9 @@ #include <jack/jack.h> #include <jack/ringbuffer.h> #include <fst.h> +#ifdef WITH_ALSA #include <alsa/asoundlib.h> +#endif typedef struct _JackVST JackVST; @@ -28,7 +30,9 @@ struct _JackVST { 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; diff --git a/libs/fst/vsti.c b/libs/fst/vsti.c index a9f5076775..ed79ea0c3c 100644 --- a/libs/fst/vsti.c +++ b/libs/fst/vsti.c @@ -34,6 +34,8 @@ #include <sched.h> #include "ardour/vestige/aeffectx.h" +#ifdef WITH_ALSA + snd_seq_t * create_sequencer (const char* client_name, bool isinput) { @@ -185,6 +187,6 @@ void stop_midireceiver (JackVST *jvst) pthread_join (jvst->midi_thread,NULL); snd_seq_close (jvst->seq); } - +#endif |