diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2015-10-03 16:22:19 +1000 |
|---|---|---|
| committer | Tim Mayberry <mojofunk@gmail.com> | 2015-10-06 13:29:57 +1000 |
| commit | 34d9b2148ebf834267821bf9c437e520b4eb05d7 (patch) | |
| tree | 0fea930e1f23bec9db0ebce22680b85c9527cb35 | |
| parent | ef0f13cb840376a8bc8553a509597e0c8cf5a7ea (diff) | |
Remove an unnecessary boolean argument in jack utils
Specify latency in JackCommandLineOptions instead
| -rw-r--r-- | libs/backends/jack/jack_audiobackend.cc | 11 | ||||
| -rw-r--r-- | libs/backends/jack/jack_utils.cc | 4 | ||||
| -rw-r--r-- | libs/backends/jack/jack_utils.h | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc index b414eda563..944fa4111c 100644 --- 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 fa8a1aee14..6fb3201c99 100644 --- 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 ee8575c5c8..5a06fe7ad7 100644 --- 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); } |