From f41e0cd4a21f19963654a461ae1570ed18dff3d4 Mon Sep 17 00:00:00 2001 From: "Julien \"_FrnchFrgg_\" RIVAUD" Date: Fri, 29 Jul 2016 20:49:54 +0200 Subject: Make monitor detection reuse the port name translation So that they never get out of sync, and translators don't get confused. Also replace some N_() where X_() was really intended. --- gtk2_ardour/port_group.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc index 084514363a..093e307f9c 100644 --- a/gtk2_ardour/port_group.cc +++ b/gtk2_ardour/port_group.cc @@ -549,10 +549,11 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp we excluded them earlier. */ - string lp = p; + string lp = p, monitor = _("Monitor"); boost::to_lower (lp); + boost::to_lower (monitor); - if ((lp.find (N_(":monitor")) != string::npos) && + if ((lp.find (monitor) != string::npos) && (lp.find (lpn) != string::npos)) { ++s; continue; @@ -568,9 +569,9 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp if (ph) { DataType t (AudioEngine::instance()->port_engine().port_data_type (ph)); if (t != DataType::NIL) { - if (port_has_prefix (p, N_("system:")) || - port_has_prefix (p, N_("alsa_pcm:")) || - port_has_prefix (p, N_("alsa_midi:"))) { + if (port_has_prefix (p, X_("system:")) || + port_has_prefix (p, X_("alsa_pcm:")) || + port_has_prefix (p, X_("alsa_midi:"))) { extra_system[t].push_back (p); } else if (port_has_prefix (p, lpnc)) { /* Hide scene ports from non-Tracks Live builds */ -- cgit v1.2.3