diff options
| -rw-r--r-- | acinclude.m4 | 15 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | hosts/Makefile.am | 5 | ||||
| -rw-r--r-- | hosts/jack_compat.c | 45 |
4 files changed, 69 insertions, 0 deletions
diff --git a/acinclude.m4 b/acinclude.m4 new file mode 100644 index 0000000..22592fe --- /dev/null +++ b/acinclude.m4 @@ -0,0 +1,15 @@ +# Copyright (C) 2007 Nedko Arnaudov <nedko@arnaudov.name> +# This file is distributed under the same terms as the Autoconf macro files. + +AC_DEFUN([AC_JACK_MIDI_NFRAMES_CHECK], [ +AC_MSG_CHECKING([whether JACK MIDI functions need nframes parameter]) +AC_LANG_PUSH(C) +AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[ +#include <jack/jack.h> +#include <jack/midiport.h> +]], [[ +jack_midi_event_get(0, 0, 0, 0); +]]), [jackmidi_nframes='yes'], [jackmidi_nframes='no']) +AC_MSG_RESULT([$jackmidi_nframes]) +AC_LANG_POP() +]) diff --git a/configure.ac b/configure.ac index bbc7590..f2d7050 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,10 @@ AC_ARG_ENABLE(jack, if test "$build_jack" = "yes"; then PKG_CHECK_MODULES(JACK, jack >= 0.102.29, build_jack="yes", build_jack="no") AC_DEFINE(HAVE_JACK, 1, [Has JACK]) + AC_JACK_MIDI_NFRAMES_CHECK() + if test "$jackmidi_nframes" == "yes"; then + AC_DEFINE([JACK_MIDI_NEEDS_NFRAMES], 1, [Defined if we JACK MIDI functions need nframes parameter.]) + fi else AC_MSG_WARN("Sufficiently recent JACK not found, JACK clients will not be built.") fi diff --git a/hosts/Makefile.am b/hosts/Makefile.am index 25c49a7..b07e74f 100644 --- a/hosts/Makefile.am +++ b/hosts/Makefile.am @@ -14,7 +14,12 @@ 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 \ lv2_jack_host.c +lv2_simple_jack_host_SOURCES = \ + jack_compat.c \ + lv2_simple_jack_host.c + endif diff --git a/hosts/jack_compat.c b/hosts/jack_compat.c new file mode 100644 index 0000000..65c2ca7 --- /dev/null +++ b/hosts/jack_compat.c @@ -0,0 +1,45 @@ +/* JACK MIDI API compatibility hacks. + * Copyright (C) 2007 Nedko Arnaudov <nedko@arnaudov.name> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.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 +#endif + +#if defined(JACK_MIDI_NEEDS_NFRAMES) + +inline jack_nframes_t +jack_midi_get_event_count_compat( + void * port_buffer) +{ + return jack_midi_get_event_count(port_buffer, 0); +} + +inline int +jack_midi_event_get_compat( + jack_midi_event_t * event, + void * port_buffer, + jack_nframes_t event_index) +{ + return jack_midi_event_get(event, port_buffer, event_index, 0); +} + +#define jack_midi_get_event_count jack_midi_get_event_count_compat +#define jack_midi_event_get jack_midi_event_get_compat + +#endif /* #if defined(HAVE_JACK_MIDI_WITH_NFRAMES) */ |