(Messy merge fixes)

- (Re) added Jack MIDI configure stuff to build script
- Fixed MIDI initialization (pass Jack client to MIDI::Manager)


git-svn-id: svn://localhost/ardour2/branches/midi@582 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 14 insertions, 4 deletions

diff --git a/SConstruct b/SConstruct
index 6213ec85f4..116cc24275 100644
--- a/SConstruct
+++ b/SConstruct
@@ -462,18 +462,25 @@ libraries['dmalloc'] = conf.Finish ()
 # 
 
 conf = Configure(env)
-
-if conf.CheckCHeader('alsa/asoundlib.h'):
+if conf.CheckCHeader('jack/midiport.h'):
+    libraries['sysmidi'] = LibraryInfo (LIBS='jack')
+    env['SYSMIDI'] = 'JACK MIDI'
+    subst_dict['%MIDITAG%'] = "control"
+    subst_dict['%MIDITYPE%'] = "jack"
+    print "Using JACK MIDI"
+elif conf.CheckCHeader('alsa/asoundlib.h'):
     libraries['sysmidi'] = LibraryInfo (LIBS='asound')
     env['SYSMIDI'] = 'ALSA Sequencer'
     subst_dict['%MIDITAG%'] = "seq"
     subst_dict['%MIDITYPE%'] = "alsa/sequencer"
+    print "Using ALSA MIDI"
 elif conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/CoreMIDI.h'):
     # this line is needed because scons can't handle -framework in ParseConfig() yet.
     libraries['sysmidi'] = LibraryInfo (LINKFLAGS= '-framework CoreMIDI -framework CoreFoundation -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox -bind_at_load')
     env['SYSMIDI'] = 'CoreMIDI'
     subst_dict['%MIDITAG%'] = "ardour"
     subst_dict['%MIDITYPE%'] = "coremidi"
+    print "Using CoreMIDI"
 else:
     print "It appears you don't have the required MIDI libraries installed."
     sys.exit (1)
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index 762ee101f8..8e36ca8074 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -47,6 +47,7 @@
 #include <ardour/utils.h>
 #include <ardour/session.h>
 #include <ardour/control_protocol_manager.h>
+#include <ardour/audioengine.h>
 
 #ifdef HAVE_LIBLO
 #include <ardour/osc.h>
@@ -99,7 +100,7 @@ setup_osc ()
 #endif
 
 static int 
-setup_midi ()
+setup_midi (AudioEngine& engine	)
 {
 	std::map<string,Configuration::MidiPortDescriptor*>::iterator i;
 	int nports;
@@ -109,6 +110,8 @@ setup_midi ()
 		return 0;
 	}
 
+	MIDI::Manager::instance()->set_api_data(engine.jack());
+
 	for (i = Config->midi_ports.begin(); i != Config->midi_ports.end(); ++i) {
 		Configuration::MidiPortDescriptor* port_descriptor;
 
@@ -202,7 +205,7 @@ ARDOUR::init (AudioEngine& engine, bool use_vst, bool try_optimization, void (*s
 
 	Config->set_use_vst (use_vst);
 
-	if (setup_midi ()) {
+	if (setup_midi (engine)) {
 		return -1;
 	}