diff options
| author | Michael Fisher <mfisher31@gmail.com> | 2013-07-28 14:05:24 -0500 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-07-29 20:05:10 +0200 |
| commit | 20189330d132a9671f1ec95dc65fc7c2926e2405 (patch) | |
| tree | f05423a26d0897caaae3d96d1daf468d31d6baa3 /gtk2_ardour | |
| parent | 741bb8e7fb8e6881fffc3c56089e8f9d91df1673 (diff) | |
Add relavent OSX midi options in the startup dialog
- MIDI driver options are now "None" and "coremidi" on OSX
- If coremidi is selected, jack will start with midi activated
- Requires Jack OSX version 0.90 beta 15 (or another version that
supports midi
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/engine_dialog.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index a9e04d8db0..05cd9a661e 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -167,8 +167,12 @@ EngineControl::EngineControl () strings.clear (); strings.push_back (_("None")); +#ifdef __APPLE__ + strings.push_back (_("coremidi")); +#else strings.push_back (_("seq")); strings.push_back (_("raw")); +#endif set_popdown_strings (midi_driver_combo, strings); midi_driver_combo.set_active_text (strings.front ()); @@ -439,6 +443,12 @@ EngineControl::build_command_line (vector<string>& cmd) cmd.push_back ("-T"); // temporary */ + /* setup coremidi before the driver, otherwise jack won't start */ + + if (midi_driver_combo.get_active_text() == _("coremidi")) { + cmd.push_back ("-X coremidi"); + } + /* next the driver */ cmd.push_back ("-d"); |