From 9f2ab81df6709d7b5d5701abbedc63d39e7330ab Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 11 Sep 2013 21:00:21 -0400 Subject: always add a timeout value of 200msec to jack, just like qjackctl does. THIS IS A HACK. LONG TERM GOAL: understand why ardour gets zombified on the way up. --- libs/backends/jack/jack_utils.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libs/backends/jack/jack_utils.cc') diff --git a/libs/backends/jack/jack_utils.cc b/libs/backends/jack/jack_utils.cc index 77f3d95aa1..93fc3d440a 100644 --- a/libs/backends/jack/jack_utils.cc +++ b/libs/backends/jack/jack_utils.cc @@ -682,7 +682,7 @@ ARDOUR::JackCommandLineOptions::JackCommandLineOptions () } bool -ARDOUR::get_jack_command_line_string (const JackCommandLineOptions& options, string& command_line) +ARDOUR::get_jack_command_line_string (JackCommandLineOptions& options, string& command_line) { vector args; @@ -699,6 +699,11 @@ ARDOUR::get_jack_command_line_string (const JackCommandLineOptions& options, str } #endif + /* XXX hack to enforce qjackctl-like behaviour */ + if (options.timeout == 0) { + options.timeout = 200; + } + if (options.timeout) { args.push_back ("-t"); args.push_back (to_string (options.timeout, std::dec)); -- cgit v1.2.3