diff options
| -rw-r--r-- | acinclude.m4 | 15 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/engine/JackDriver.cpp | 1 | ||||
| -rw-r--r-- | src/engine/jack_compat.h | 56 |
4 files changed, 79 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 552ceb7..47be94f 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,13 @@ if test "$with_jack" = "yes"; then fi fi AM_CONDITIONAL(WITH_JACK, [test "$with_jack" = "yes"]) +if test "$with_jack" = "yes"; then + AC_DEFINE(HAVE_JACK_MIDI, 1, [Has Jack MIDI]) + 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 +fi # Check for debugging flag debug="no" diff --git a/src/engine/JackDriver.cpp b/src/engine/JackDriver.cpp index 39061ed..e56aa4b 100644 --- a/src/engine/JackDriver.cpp +++ b/src/engine/JackDriver.cpp @@ -19,6 +19,7 @@ #include <iomanip> #include "machina/JackDriver.hpp" #include "machina/MidiAction.hpp" +#include "jack_compat.h" using namespace Raul; diff --git a/src/engine/jack_compat.h b/src/engine/jack_compat.h new file mode 100644 index 0000000..792148e --- /dev/null +++ b/src/engine/jack_compat.h @@ -0,0 +1,56 @@ +/* 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. + */ + +#ifndef JACK_COMPAT_H +#define JACK_COMPAT_H + + +#if defined(JACK_MIDI_NEEDS_NFRAMES) + +jack_nframes_t +jack_midi_get_event_count_compat( + void * port_buffer) +{ +#if defined(HAVE_OLD_JACK_MIDI) + return jack_midi_port_get_info(port_buffer, 0)->event_count; +#else + return jack_midi_get_event_count(port_buffer, 0); +#endif +} + +#define jack_midi_get_event_count jack_midi_get_event_count_compat + +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_event_get jack_midi_event_get_compat + +#else + +#if defined(HAVE_OLD_JACK_MIDI) +#error "Old (0.102.20) JACK MIDI API needs nframes (autotools probably gone mad)" +#endif + +#endif /* #if defined(JACK_MIDI_NEEDS_NFRAMES) */ + +#endif /* JACK_COMPAT_H */ |