[SCM] calf/master: + JACK host: move MIDI inputs before audio outputs

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 46aba43c7ace61804bda9a335d0a15cfc857f74f
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Sun Jan 4 23:03:44 2009 +0000

    + JACK host: move MIDI inputs before audio outputs

diff --git a/src/jackhost.cpp b/src/jackhost.cpp
index 4e9f262..b87f386 100644
--- a/src/jackhost.cpp
+++ b/src/jackhost.cpp
@@ -83,6 +83,15 @@ void jack_host_base::create_ports() {
             throw text_exception("Could not create JACK input port");
         jack_port_set_alias(inputs[i].handle, buf2);
     }
+    if (get_midi()) {
+        sprintf(buf, "%s_midi_in", instance_name.c_str());
+        sprintf(buf2, client->midi_name.c_str(), client->midi_nr++);
+        midi_port.name = buf;
+        midi_port.handle = jack_port_register(client->client, buf, JACK_DEFAULT_MIDI_TYPE, JackPortIsInput, 0);
+        if (!midi_port.handle)
+            throw text_exception("Could not create JACK MIDI port");
+        jack_port_set_alias(midi_port.handle, buf2);
+    }
     for (int i=0; i<out_count; i++) {
         sprintf(buf, "%s_out_%s", instance_name.c_str(), suffixes[i]);
         sprintf(buf2, client->output_name.c_str(), client->output_nr++);
@@ -93,15 +102,6 @@ void jack_host_base::create_ports() {
             throw text_exception("Could not create JACK output port");
         jack_port_set_alias(outputs[i].handle, buf2);
     }
-    if (get_midi()) {
-        sprintf(buf, "%s_midi_in", instance_name.c_str());
-        sprintf(buf2, client->midi_name.c_str(), client->midi_nr++);
-        midi_port.name = buf;
-        midi_port.handle = jack_port_register(client->client, buf, JACK_DEFAULT_MIDI_TYPE, JackPortIsInput, 0);
-        if (!midi_port.handle)
-            throw text_exception("Could not create JACK MIDI port");
-        jack_port_set_alias(midi_port.handle, buf2);
-    }
 }
 
 void jack_host_base::close() {

-- 
calf audio plugins packaging