smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 07:14:56 +01:00
Code Issues Projects Releases Wiki Activity

always add a timeout value of 200msec to jack, just like qjackctl does.

Browse source 
THIS IS A HACK. LONG TERM GOAL: understand why ardour gets zombified on the way up.
This commit is contained in:
Paul Davis 2013-09-11 21:00:21 -04:00
parent f85b362351
commit 9f2ab81df6
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libs/backends/jack/jack_utils.cc
View file

@ -682,7 +682,7 @@ ARDOUR::JackCommandLineOptions::JackCommandLineOptions ()
} }
bool 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; vector<string> args;
@ -699,6 +699,11 @@ ARDOUR::get_jack_command_line_string (const JackCommandLineOptions& options, str
} }
#endif #endif
/* XXX hack to enforce qjackctl-like behaviour */
if (options.timeout == 0) {
options.timeout = 200;
}
if (options.timeout) { if (options.timeout) {
args.push_back ("-t"); args.push_back ("-t");
args.push_back (to_string (options.timeout, std::dec)); args.push_back (to_string (options.timeout, std::dec));

2
libs/backends/jack/jack_utils.h
View file

@ -231,5 +231,5 @@ namespace ARDOUR {
/** /**
* @return true if able to build a valid command line based on options * @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);
} }