From 0108d1d900a2481a2cbfd175814d1e3b43f50a1b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 10 Dec 2010 15:43:01 +0000 Subject: don't show monitor bus inputs in matrix(es); relabel tabs in port matrix; change label for monitoring preference to be clearer git-svn-id: svn://localhost/ardour2/branches/3.0@8234 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/port_group.cc | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'gtk2_ardour/port_group.cc') diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc index aabe07157b..c52a76d2c5 100644 --- a/gtk2_ardour/port_group.cc +++ b/gtk2_ardour/port_group.cc @@ -330,10 +330,10 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp return; } - boost::shared_ptr bus (new PortGroup (_("Bus"))); - boost::shared_ptr track (new PortGroup (_("Track"))); - boost::shared_ptr system (new PortGroup (_("System"))); - boost::shared_ptr ardour (new PortGroup (PROGRAM_NAME)); + boost::shared_ptr bus (new PortGroup (string_compose (PROGRAM_NAME " %1", _("Busses")))); + boost::shared_ptr track (new PortGroup (string_compose (PROGRAM_NAME " %1", _("Tracks")))); + boost::shared_ptr system (new PortGroup (_("Hardware"))); + boost::shared_ptr ardour (new PortGroup (string_compose (PROGRAM_NAME " %1", _("Misc")))); boost::shared_ptr other (new PortGroup (_("Other"))); /* Find the IOs which have bundles for routes and their processors. We store @@ -346,9 +346,16 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp for (RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) { + /* we never show the monitor bus inputs */ + + if (inputs && (*i)->is_monitor()) { + continue; + } + /* keep track of IOs that we have taken bundles from, so that we can avoid taking the same IO from both - Route::output() and the main_outs Delivery */ + Route::output() and the main_outs Delivery + */ set > used_io; boost::shared_ptr io = inputs ? (*i)->input() : (*i)->output(); -- cgit v1.2.3