From 33ea2d25f1e11bf97f36053eaa367c2e121ae8fe Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 16 Jun 2014 23:36:29 +0200 Subject: [PATCH] hide "turn down volume" label for midi-latency measurement --- gtk2_ardour/engine_dialog.cc | 18 +++++++++++------- gtk2_ardour/engine_dialog.h | 1 + 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index df5a6a95f3..a89ddddb1a 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -141,16 +141,14 @@ EngineControl::EngineControl () lm_table.attach (lm_title, 0, 3, row, row+1, xopt, (AttachOptions) 0); row++; - Gtk::Label* preamble; + lm_preamble.set_width_chars (60); + lm_preamble.set_line_wrap (true); + lm_preamble.set_markup (_("Turn down the volume on your audio equipment to a very low level.")); - preamble = manage (new Label); - preamble->set_width_chars (60); - preamble->set_line_wrap (true); - preamble->set_markup (_("Turn down the volume on your audio equipment to a very low level.")); - - lm_table.attach (*preamble, 0, 3, row, row+1, AttachOptions(FILL|EXPAND), (AttachOptions) 0); + lm_table.attach (lm_preamble, 0, 3, row, row+1, AttachOptions(FILL|EXPAND), (AttachOptions) 0); row++; + Gtk::Label* preamble; preamble = manage (new Label); preamble->set_width_chars (60); preamble->set_line_wrap (true); @@ -533,6 +531,12 @@ EngineControl::enable_latency_tab () ARDOUR::AudioEngine::instance()->get_physical_outputs (type, outputs); ARDOUR::AudioEngine::instance()->get_physical_inputs (type, inputs); + if (_measure_midi) { + lm_preamble.set_markup (_("")); + } else { + lm_preamble.set_markup (_("Turn down the volume on your audio equipment to a very low level.")); + } + if (inputs.empty() || outputs.empty()) { MessageDialog msg (_("Your selected audio configuration is playback- or capture-only.\n\nLatency calibration requires playback and capture")); lm_measure_button.set_sensitive (false); diff --git a/gtk2_ardour/engine_dialog.h b/gtk2_ardour/engine_dialog.h index 616a76e733..3e3f9b82fb 100644 --- a/gtk2_ardour/engine_dialog.h +++ b/gtk2_ardour/engine_dialog.h @@ -93,6 +93,7 @@ class EngineControl : public ArdourDialog, public PBD::ScopedConnectionList { Gtk::Button lm_back_button; ArdourButton lm_button_audio; Gtk::Label lm_title; + Gtk::Label lm_preamble; Gtk::Label lm_results; Gtk::Table lm_table; Gtk::VBox lm_vbox;