aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-05-05 18:51:24 +0000
committerDavid Robillard <d@drobilla.net>2007-05-05 18:51:24 +0000
commit656c3abd651c251e9836baf5255e6346f028c0bc (patch)
tree328200b0add7c6a4a563cb050c9b5236cbcd25b7 /src
parentcfce5f86e3ce1572299bd62e7047e0cb985a4358 (diff)
downloadmachina-656c3abd651c251e9836baf5255e6346f028c0bc.tar.gz
machina-656c3abd651c251e9836baf5255e6346f028c0bc.tar.bz2
machina-656c3abd651c251e9836baf5255e6346f028c0bc.zip
Added Jack MIDI compatibility filthy annoying kludges.
git-svn-id: http://svn.drobilla.net/lad/machina@507 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src')
-rw-r--r--src/engine/JackDriver.cpp1
-rw-r--r--src/engine/jack_compat.h56
2 files changed, 57 insertions, 0 deletions
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 */