diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-11 21:00:21 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-11 21:00:21 -0400 |
| commit | 9f2ab81df6709d7b5d5701abbedc63d39e7330ab (patch) | |
| tree | 6f325f10ea05f592729af00b3c3a9e12a56a115a /libs | |
| parent | f85b362351a5f9167f93b6988f2c8a4c7e03a33c (diff) | |
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.
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/backends/jack/jack_utils.cc | 7 | ||||
| -rw-r--r-- | libs/backends/jack/jack_utils.h | 2 |
2 files changed, 7 insertions, 2 deletions
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<string> 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)); diff --git a/libs/backends/jack/jack_utils.h b/libs/backends/jack/jack_utils.h index 7565353198..a7521ad1c4 100644 --- a/libs/backends/jack/jack_utils.h +++ b/libs/backends/jack/jack_utils.h @@ -231,5 +231,5 @@ namespace ARDOUR { /** * @return true if able to build a valid command line based on options */ - bool get_jack_command_line_string (const JackCommandLineOptions& options, std::string& command_line); + bool get_jack_command_line_string (JackCommandLineOptions& options, std::string& command_line); } |