diff options
| author | David Robillard <d@drobilla.net> | 2006-06-14 02:27:09 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-06-14 02:27:09 +0000 |
| commit | a8f44b1556e68f4cf28bd52e6de7359581a1ec45 (patch) | |
| tree | ca36a1ffe1b83860ccffb68b0054156c785a987f /libs/ardour | |
| parent | 868f557f2612903f72614a2b3a317c7a528188d1 (diff) | |
(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
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/globals.cc | 7 |
1 files changed, 5 insertions, 2 deletions
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; } |