summaryrefslogtreecommitdiff
path: root/gtk2_ardour/engine_dialog.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-10-12 10:04:20 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-10-12 10:04:20 -0400
commit949a0d29344b43ad4df998e6041a86b41fbd4869 (patch)
treef5312d14b4ace622ebcb4dfbd2bc0d1b2e699d3c /gtk2_ardour/engine_dialog.cc
parentfdda8127eff8daad24a64ff9173d5ce4dc1e3f21 (diff)
minor adjustments to latency measurement UI stuff
Diffstat (limited to 'gtk2_ardour/engine_dialog.cc')
-rw-r--r--gtk2_ardour/engine_dialog.cc20
1 files changed, 11 insertions, 9 deletions
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index dccffde949..63c817d70c 100644
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -1648,23 +1648,25 @@ EngineControl::start_latency_detection ()
{
ARDOUR::AudioEngine::instance()->set_latency_input_port (lm_input_channel_combo.get_active_text());
ARDOUR::AudioEngine::instance()->set_latency_output_port (lm_output_channel_combo.get_active_text());
- ARDOUR::AudioEngine::instance()->start_latency_detection ();
- lm_results.set_text (_("Detecting ..."));
- latency_timeout = Glib::signal_timeout().connect (mem_fun (*this, &EngineControl::check_latency_measurement), 250);
- lm_start_stop_label.set_text (_("Cancel measurement"));
- have_lm_results = false;
- lm_input_channel_combo.set_sensitive (false);
- lm_output_channel_combo.set_sensitive (false);
+
+ if (ARDOUR::AudioEngine::instance()->start_latency_detection () == 0) {
+ lm_results.set_text (_("Detecting ..."));
+ latency_timeout = Glib::signal_timeout().connect (mem_fun (*this, &EngineControl::check_latency_measurement), 100);
+ lm_start_stop_label.set_text (_("Cancel measurement"));
+ have_lm_results = false;
+ lm_input_channel_combo.set_sensitive (false);
+ lm_output_channel_combo.set_sensitive (false);
+ }
}
void
EngineControl::end_latency_detection ()
{
- ARDOUR::AudioEngine::instance()->stop_latency_detection ();
latency_timeout.disconnect ();
+ ARDOUR::AudioEngine::instance()->stop_latency_detection ();
lm_start_stop_label.set_text (_("Measure latency"));
if (!have_lm_results) {
- lm_results.set_markup ("<i>No measurement results yet</i>");
+ lm_results.set_markup (string_compose ("<i>%1</i>", _("No measurement results yet")));
}
lm_input_channel_combo.set_sensitive (true);
lm_output_channel_combo.set_sensitive (true);