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 | bf2d76b7bbd50918027649ca3971ccfa934fffb3 (patch) | |
| tree | dd495bb9a6f175bc27cebdad767f123f2386f412 | |
| parent | a73885e91b4ef3f648bf2a2e74fa43bf7e716f17 (diff) | |
| download | ingen-bf2d76b7bbd50918027649ca3971ccfa934fffb3.tar.gz ingen-bf2d76b7bbd50918027649ca3971ccfa934fffb3.tar.bz2 ingen-bf2d76b7bbd50918027649ca3971ccfa934fffb3.zip | |
More Jack MIDI API compatibility jacks.
git-svn-id: http://svn.drobilla.net/lad/ingen@421 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | src/libs/engine/JackMidiDriver.cpp | 1 | ||||
| -rw-r--r-- | src/libs/engine/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libs/engine/jack_compat.h (renamed from src/libs/engine/jack_compat.c) | 9 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/libs/engine/JackMidiDriver.cpp b/src/libs/engine/JackMidiDriver.cpp index 44c44725..7170753f 100644 --- a/src/libs/engine/JackMidiDriver.cpp +++ b/src/libs/engine/JackMidiDriver.cpp @@ -26,6 +26,7 @@ #include "AudioDriver.h" #include "MidiBuffer.h" #include "DuplexPort.h" +#include "jack_compat.h" #ifdef HAVE_LASH #include "LashDriver.h" #endif diff --git a/src/libs/engine/Makefile.am b/src/libs/engine/Makefile.am index 2f71604b..49308afa 100644 --- a/src/libs/engine/Makefile.am +++ b/src/libs/engine/Makefile.am @@ -163,7 +163,7 @@ if WITH_JACK_MIDI libingen_la_SOURCES += \ JackMidiDriver.h \ JackMidiDriver.cpp \ - jack_compat.c + jack_compat.h endif if WITH_ALSA_MIDI diff --git a/src/libs/engine/jack_compat.c b/src/libs/engine/jack_compat.h index 859f8f48..d7b5df64 100644 --- a/src/libs/engine/jack_compat.c +++ b/src/libs/engine/jack_compat.h @@ -15,20 +15,23 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ +#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 #endif #if defined(JACK_MIDI_NEEDS_NFRAMES) -jack_nframes_t +inline jack_nframes_t jack_midi_get_event_count_compat( void * port_buffer) { return jack_midi_get_event_count(port_buffer, 0); } -int +inline int jack_midi_event_get_compat( jack_midi_event_t * event, void * port_buffer, @@ -41,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 */ |