Remove an unnecessary boolean argument in jack utils

Specify latency in JackCommandLineOptions instead

diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc
index b414eda5638dc275b83ae5ecdfbf3e00f64f53c0..944fa4111cb426d8372d94ca6c8158da9b93374f 100644 (file)
--- a/libs/backends/jack/jack_audiobackend.cc
+++ b/libs/backends/jack/jack_audiobackend.cc
@@ -464,8 +464,13 @@ JACKAudioBackend::setup_jack_startup_command (bool for_latency_measurement)
        options.num_periods = 2;
        options.input_device = _target_device;
        options.output_device = _target_device;
-       options.input_latency = _target_systemic_input_latency;
-       options.output_latency = _target_systemic_output_latency;
+       if (for_latency_measurement) {
+               options.input_latency = 0;
+               options.output_latency = 0;
+       } else {
+               options.input_latency = _target_systemic_input_latency;
+               options.output_latency = _target_systemic_output_latency;
+       }
        options.input_channels = _target_input_channels;
        options.output_channels = _target_output_channels;
        if (_target_sample_format == FormatInt16) {
@@ -483,7 +488,7 @@ JACKAudioBackend::setup_jack_startup_command (bool for_latency_measurement)
 
        string cmdline;
 
-       if (!get_jack_command_line_string (options, cmdline, for_latency_measurement)) {
+       if (!get_jack_command_line_string (options, cmdline)) {
                /* error, somehow - we will still try to start JACK
                 * automatically but it will be without our preferred options
                 */

diff --git a/libs/backends/jack/jack_utils.cc b/libs/backends/jack/jack_utils.cc
index fa8a1aee145ee32849ec5cba1156d01204642018..6fb3201c99802fb0b859f18646ee2d034db45c81 100644 (file)
--- a/libs/backends/jack/jack_utils.cc
+++ b/libs/backends/jack/jack_utils.cc
@@ -688,7 +688,7 @@ ARDOUR::JackCommandLineOptions::JackCommandLineOptions ()
 }
 
 bool
-ARDOUR::get_jack_command_line_string (JackCommandLineOptions& options, string& command_line, bool for_latency_measurement)
+ARDOUR::get_jack_command_line_string (JackCommandLineOptions& options, string& command_line)
 {
        vector<string> args;
 
@@ -841,7 +841,7 @@ ARDOUR::get_jack_command_line_string (JackCommandLineOptions& options, string& c
        args.push_back ("-p");
        args.push_back (to_string (options.period_size, std::dec));
 
-       if (!for_latency_measurement && get_jack_audio_driver_supports_latency_adjustment (options.driver)) {
+       if (get_jack_audio_driver_supports_latency_adjustment (options.driver)) {
                if (options.input_latency) {
                        args.push_back ("-I");
                        args.push_back (to_string (options.input_latency, std::dec));

diff --git a/libs/backends/jack/jack_utils.h b/libs/backends/jack/jack_utils.h
index ee8575c5c85487adbac8c53926e9e7362bb3b3f8..5a06fe7ad7c7a5bcfb328821b4af1cb43e84065d 100644 (file)
--- a/libs/backends/jack/jack_utils.h
+++ b/libs/backends/jack/jack_utils.h
@@ -236,5 +236,5 @@ namespace ARDOUR {
        /**
         * @return true if able to build a valid command line based on options
         */
-       bool get_jack_command_line_string (JackCommandLineOptions& options, std::string& command_line, bool for_latency_measurement);
+       bool get_jack_command_line_string (JackCommandLineOptions& options, std::string& command_line);
 }