From 679903fd228d5fee6139d61e599ba4a7c61f14d8 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 11 Aug 2015 19:43:57 +0200 Subject: [PATCH] fix jack startup on OSX (w/midi) --- libs/backends/jack/jack_utils.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/backends/jack/jack_utils.cc b/libs/backends/jack/jack_utils.cc index c6cbf0fc69..2ea110d6d7 100644 --- a/libs/backends/jack/jack_utils.cc +++ b/libs/backends/jack/jack_utils.cc @@ -698,8 +698,10 @@ ARDOUR::get_jack_command_line_string (JackCommandLineOptions& options, string& c #ifdef PLATFORM_WINDOWS // must use sync mode on windows args.push_back ("-S"); +#endif - // this needs to be added now on windows +#if (defined PLATFORM_WINDOWS || defined __APPLE__) + // midi systems needs to be added before the audio driver for jack2 if (!options.midi_driver.empty () && options.midi_driver != get_none_string ()) { args.push_back ("-X"); args.push_back (options.midi_driver); @@ -879,7 +881,7 @@ ARDOUR::get_jack_command_line_string (JackCommandLineOptions& options, string& c } } - if (options.driver == alsa_driver_name || options.driver == coreaudio_driver_name) { + if (options.driver == alsa_driver_name) { if (options.midi_driver != alsa_seq_midi_driver_name) { if (!options.midi_driver.empty() && options.midi_driver != get_none_string ()) {