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

Revert "When writing '.jackdrc' make sure we enclose any device names in

Browse source 
quotation marks". This patch is incorrect. The string quoting must be done ONLY
when creating a string to be written to ~/.jackdrc or similar, not when
constructing an argument list.

This reverts commit 5626ea2b1f.
This commit is contained in:
Paul Davis 2014-06-03 20:08:26 -04:00
parent 0fb82b76e4
commit 88c511f2d1
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -855,9 +855,9 @@ ARDOUR::get_jack_command_line_string (JackCommandLineOptions& options, string& c
// capture and playback on two devices if supported // capture and playback on two devices if supported
if (get_jack_audio_driver_supports_two_devices (options.driver)) { if (get_jack_audio_driver_supports_two_devices (options.driver)) {
args.push_back ("-C"); args.push_back ("-C");
args.push_back (quote_string (command_line_input_device_name)); args.push_back (command_line_input_device_name);
args.push_back ("-P"); args.push_back ("-P");
args.push_back (quote_string (command_line_output_device_name)); args.push_back (command_line_output_device_name);
} else { } else {
return false; return false;
} }
@ -910,7 +910,7 @@ ARDOUR::get_jack_command_line_string (JackCommandLineOptions& options, string& c
if (options.driver != dummy_driver_name) { if (options.driver != dummy_driver_name) {
if (options.input_device == options.output_device && options.input_device != default_device_name) { if (options.input_device == options.output_device && options.input_device != default_device_name) {
args.push_back ("-d"); args.push_back ("-d");
args.push_back (quote_string (command_line_input_device_name)); args.push_back (command_line_input_device_name);
} }
} }