diff options
author | David Robillard <d@drobilla.net> | 2007-04-08 17:55:37 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2007-04-08 17:55:37 +0000 |
commit | 0855210596f5a5499c7bdcd7b8084317b1ea6c7a (patch) | |
tree | 3d4e698864d345e6331172d3e9fdecdf4dd886cf | |
parent | 224d4e5098a19c957966cebb10b605e64bbe4c12 (diff) | |
download | lilv-0855210596f5a5499c7bdcd7b8084317b1ea6c7a.tar.gz lilv-0855210596f5a5499c7bdcd7b8084317b1ea6c7a.tar.bz2 lilv-0855210596f5a5499c7bdcd7b8084317b1ea6c7a.zip |
More Jack MIDI API compatibility jacks.
git-svn-id: http://svn.drobilla.net/lad/slv2@421 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r-- | hosts/Makefile.am | 4 | ||||
-rw-r--r-- | hosts/jack_compat.h (renamed from hosts/jack_compat.c) | 5 | ||||
-rw-r--r-- | hosts/lv2_jack_host.c | 1 | ||||
-rw-r--r-- | hosts/lv2_simple_jack_host.c | 1 |
4 files changed, 8 insertions, 3 deletions
diff --git a/hosts/Makefile.am b/hosts/Makefile.am index b07e74f..a599bd4 100644 --- a/hosts/Makefile.am +++ b/hosts/Makefile.am @@ -14,11 +14,11 @@ lv2_jack_host_LDADD = ../src/libslv2.la @JACK_LIBS@ @RASQAL_LIBS@ lv2_simple_jack_host_LDADD = ../src/libslv2.la @JACK_LIBS@ @RASQAL_LIBS@ lv2_jack_host_SOURCES = \ - jack_compat.c \ + jack_compat.h \ lv2_jack_host.c lv2_simple_jack_host_SOURCES = \ - jack_compat.c \ + jack_compat.h \ lv2_simple_jack_host.c endif diff --git a/hosts/jack_compat.c b/hosts/jack_compat.h index 65c2ca7..d7b5df6 100644 --- a/hosts/jack_compat.c +++ b/hosts/jack_compat.h @@ -15,7 +15,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" +#ifndef JACK_COMPAT_H +#define JACK_COMPAT_H #if defined(HAVE_OLD_JACK_MIDI) #define jack_midi_get_event_count(port_buf, nframes) jack_midi_port_get_info(port_buf, nframes)->event_count @@ -43,3 +44,5 @@ jack_midi_event_get_compat( #define jack_midi_event_get jack_midi_event_get_compat #endif /* #if defined(HAVE_JACK_MIDI_WITH_NFRAMES) */ + +#endif /* JACK_COMPAT_H */ diff --git a/hosts/lv2_jack_host.c b/hosts/lv2_jack_host.c index ac9f2ff..9cc31d9 100644 --- a/hosts/lv2_jack_host.c +++ b/hosts/lv2_jack_host.c @@ -21,6 +21,7 @@ #include <string.h> #include <slv2/slv2.h> #include <jack/jack.h> +#include "jack_compat.h" #define WITH_MIDI 1 #define MIDI_BUFFER_SIZE 1024 diff --git a/hosts/lv2_simple_jack_host.c b/hosts/lv2_simple_jack_host.c index 3e808c2..af18bbf 100644 --- a/hosts/lv2_simple_jack_host.c +++ b/hosts/lv2_simple_jack_host.c @@ -21,6 +21,7 @@ #include <string.h> #include <slv2/slv2.h> #include <jack/jack.h> +#include "jack_compat.h" /** This program's data */ |