summaryrefslogtreecommitdiff
path: root/libs/ardour/globals.cc
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-05-04 02:50:31 +0000
committerDavid Robillard <d@drobilla.net>2007-05-04 02:50:31 +0000
commitb8e9b3f071e294488eb03f9e13adc333352909bb (patch)
treea242bef63b3ead0d86ab258cc50ba32bb7e250f5 /libs/ardour/globals.cc
parentacdfe9857a7b84ca151f3ab696ea696d6c778dca (diff)
Real fix for Jack MIDI crash. Maybe!
git-svn-id: svn://localhost/ardour2/branches/midi@1782 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/globals.cc')
-rw-r--r--libs/ardour/globals.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc
index ce0b333bcb..fcebe92dce 100644
--- a/libs/ardour/globals.cc
+++ b/libs/ardour/globals.cc
@@ -108,8 +108,8 @@ setup_osc ()
}
#endif
-static int
-setup_midi (AudioEngine& engine )
+int
+ARDOUR::setup_midi (AudioEngine& engine)
{
std::map<string,Configuration::MidiPortDescriptor*>::iterator i;
int nports;
@@ -286,7 +286,7 @@ setup_hardware_optimization (bool try_optimization)
}
int
-ARDOUR::init (ARDOUR::AudioEngine& engine, bool use_vst, bool try_optimization)
+ARDOUR::init (bool use_vst, bool try_optimization)
{
extern void setup_enum_writer ();
@@ -307,10 +307,6 @@ ARDOUR::init (ARDOUR::AudioEngine& engine, bool use_vst, bool try_optimization)
Profile = new RuntimeProfile;
- if (setup_midi (engine)) {
- return -1;
- }
-
#ifdef HAVE_LIBLO
if (setup_osc ()) {
return -1;