From 799e535b2abae78efffbac4abd3efd8ba2483221 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 20 Sep 2019 23:30:05 +0200 Subject: Fix latency-measurement port-name display In case there are no pretty-names, a blank text was displayed --- gtk2_ardour/engine_dialog.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gtk2_ardour/engine_dialog.cc') diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index d7566efca7..107e5bbf24 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -754,7 +754,11 @@ EngineControl::enable_latency_tab () Gtk::TreeModel::iterator iter = lm_output_channel_list->append (); Gtk::TreeModel::Row row = *iter; row[lm_output_channel_cols.port_name] = *i; - row[lm_output_channel_cols.pretty_name] = ARDOUR::AudioEngine::instance()->get_pretty_name_by_name (*i); + std::string pn = ARDOUR::AudioEngine::instance()->get_pretty_name_by_name (*i); + if (pn.empty()) { + pn = (*i).substr ((*i).find (':') + 1); + } + row[lm_output_channel_cols.pretty_name] = pn; } lm_output_channel_combo.set_active (0); lm_output_channel_combo.set_sensitive (true); @@ -764,7 +768,11 @@ EngineControl::enable_latency_tab () Gtk::TreeModel::iterator iter = lm_input_channel_list->append (); Gtk::TreeModel::Row row = *iter; row[lm_input_channel_cols.port_name] = *i; - row[lm_input_channel_cols.pretty_name] = ARDOUR::AudioEngine::instance()->get_pretty_name_by_name (*i); + std::string pn = ARDOUR::AudioEngine::instance()->get_pretty_name_by_name (*i); + if (pn.empty()) { + pn = (*i).substr ((*i).find (':') + 1); + } + row[lm_input_channel_cols.pretty_name] = pn; } lm_input_channel_combo.set_active (0); lm_input_channel_combo.set_sensitive (true); -- cgit v1.2.3