diff options
| author | David Robillard <d@drobilla.net> | 2007-04-08 17:19:10 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-04-08 17:19:10 +0000 |
| commit | 679d5f9f3aca988bdebcd140b77e12d330380abc (patch) | |
| tree | 94f5a4844f9aa23197dbb3df907850d26af77f4c /src/libs | |
| parent | cd0a2541cb9b14bedf200a68ee774b506980775c (diff) | |
| download | ingen-679d5f9f3aca988bdebcd140b77e12d330380abc.tar.gz ingen-679d5f9f3aca988bdebcd140b77e12d330380abc.tar.bz2 ingen-679d5f9f3aca988bdebcd140b77e12d330380abc.zip | |
Jack MIDI API compatibility kluges.
git-svn-id: http://svn.drobilla.net/lad/ingen@418 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/engine/Makefile.am | 3 | ||||
| -rw-r--r-- | src/libs/engine/jack_compat.c | 43 |
2 files changed, 45 insertions, 1 deletions
diff --git a/src/libs/engine/Makefile.am b/src/libs/engine/Makefile.am index 2516b24a..2f71604b 100644 --- a/src/libs/engine/Makefile.am +++ b/src/libs/engine/Makefile.am @@ -162,7 +162,8 @@ libingen_la_SOURCES = \ if WITH_JACK_MIDI libingen_la_SOURCES += \ JackMidiDriver.h \ - JackMidiDriver.cpp + JackMidiDriver.cpp \ + jack_compat.c endif if WITH_ALSA_MIDI diff --git a/src/libs/engine/jack_compat.c b/src/libs/engine/jack_compat.c new file mode 100644 index 00000000..859f8f48 --- /dev/null +++ b/src/libs/engine/jack_compat.c @@ -0,0 +1,43 @@ +/* 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. + */ + +#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) + +jack_nframes_t +jack_midi_get_event_count_compat( + void * port_buffer) +{ + return jack_midi_get_event_count(port_buffer, 0); +} + +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) */ |