From 88c511f2d105264a1d5d8dc24f323de1eaa9a2d8 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 3 Jun 2014 20:08:26 -0400 Subject: [PATCH] Revert "When writing '.jackdrc' make sure we enclose any device names in 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 5626ea2b1f480bcdd5413c041ee9921fc299ab80. --- libs/backends/jack/jack_utils.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/backends/jack/jack_utils.cc b/libs/backends/jack/jack_utils.cc index 77158e55aa..fcb0d7a169 100644 --- a/libs/backends/jack/jack_utils.cc +++ b/libs/backends/jack/jack_utils.cc @@ -855,9 +855,9 @@ ARDOUR::get_jack_command_line_string (JackCommandLineOptions& options, string& c // capture and playback on two devices if supported if (get_jack_audio_driver_supports_two_devices (options.driver)) { 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 (quote_string (command_line_output_device_name)); + args.push_back (command_line_output_device_name); } else { return false; } @@ -910,7 +910,7 @@ ARDOUR::get_jack_command_line_string (JackCommandLineOptions& options, string& c if (options.driver != dummy_driver_name) { if (options.input_device == options.output_device && options.input_device != default_device_name) { args.push_back ("-d"); - args.push_back (quote_string (command_line_input_device_name)); + args.push_back (command_line_input_device_name); } }