[SCM] calf/master: + Added detection and support for old (<0.105.0) JACK MIDI

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2c805332106a26bf80874ac1890712d0f913b6ba
Author: kfoltman <kfoltman at 78b06b96-2940-0410-b7fc-879d825d01d8>
Date:   Thu Dec 13 21:52:49 2007 +0000

    + Added detection and support for old (<0.105.0) JACK MIDI
    
    
    
    git-svn-id: https://calf.svn.sourceforge.net/svnroot/calf/trunk@16 78b06b96-2940-0410-b7fc-879d825d01d8

diff --git a/configure.in b/configure.in
index 04c52a0..a920179 100644
--- a/configure.in
+++ b/configure.in
@@ -38,6 +38,10 @@ else
   JACK_FOUND="no"
 fi
 
+if test "$JACK_FOUND" = "yes"; then
+  PKG_CHECK_MODULES(JACK_MIDI_DEPS, jack >= 0.105.0, OLD_JACK="no", OLD_JACK="yes")
+fi
+
 CXXFLAGS="$CXXFLAGS -O3 -finline-functions -finline-functions-called-once -Wall"
 
 AC_SUBST(GUI_DEPS_CFLAGS)
@@ -80,6 +84,7 @@ AM_CONDITIONAL(USE_LADSPA, test "$LADSPA_FOUND" = "yes")
 AM_CONDITIONAL(USE_JACK, test "$JACK_ENABLED" = "yes")
 AM_CONDITIONAL(USE_PHAT, test "$PHAT_ENABLED" = "yes")
 AM_CONDITIONAL(ENABLE_EXPERIMENTAL, test "$set_enable_experimental" = "yes")
+AM_CONDITIONAL(OLD_JACK, test "$OLD_JACK" = "yes")
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
@@ -121,6 +126,7 @@ AC_MSG_RESULT([
 
     LADSPA enabled:         $LADSPA_FOUND
     JACK host enabled:      $JACK_ENABLED
+    Old-style JACK MIDI:    $OLD_JACK
     PHAT library enabled:   $PHAT_ENABLED
     
     Installation prefix:    $prefix
diff --git a/src/Makefile.am b/src/Makefile.am
index f127919..6fa73c2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,9 @@ AM_CXXFLAGS += -DUSE_JACK=1
 bin_PROGRAMS += calfjackhost 
 calfjackhost_SOURCES = jackhost.cpp
 calfjackhost_LDADD = libcalfstatic.la $(JACK_DEPS_LIBS) $(GUI_DEPS_LIBS)
+if OLD_JACK
+AM_CXXFLAGS += -DOLD_JACK=1
+endif
 if USE_PHAT
 AM_CXXFLAGS += -DUSE_PHAT=1 $(PHAT_DEPS_CFLAGS)
 calfjackhost_LDADD += $(PHAT_DEPS_LIBS)
diff --git a/src/calf/jackhost.h b/src/calf/jackhost.h
index 8edd3a3..aeaaedb 100644
--- a/src/calf/jackhost.h
+++ b/src/calf/jackhost.h
@@ -174,10 +174,18 @@ public:
         if (Module::support_midi)
         {
             jack_midi_event_t event;
+#ifdef OLD_JACK
+            int count = jack_midi_get_event_count(host->midi_port.data, nframes);
+#else
             int count = jack_midi_get_event_count(host->midi_port.data);
+#endif
             for (int i = 0; i < count; i++)
             {
+#ifdef OLD_JACK
+                jack_midi_event_get(&event, host->midi_port.data, i, nframes);
+#else
                 jack_midi_event_get(&event, host->midi_port.data, i);
+#endif
                 mask = module->process(time, event.time - time, -1, -1);
                 for (int i = 0; i < Module::out_count; i++) {
                     if (!(mask & (1 << i)))

-- 
calf audio plugins packaging