diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-12-10 15:43:01 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-12-10 15:43:01 +0000 |
| commit | 0108d1d900a2481a2cbfd175814d1e3b43f50a1b (patch) | |
| tree | 430e1a9bdc9211e40cad2861e42648a01c18a960 /gtk2_ardour/port_group.cc | |
| parent | 627385cab45ea14f54a79e339d3059c68f806445 (diff) | |
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
Diffstat (limited to 'gtk2_ardour/port_group.cc')
| -rw-r--r-- | gtk2_ardour/port_group.cc | 17 |
1 files changed, 12 insertions, 5 deletions
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<PortGroup> bus (new PortGroup (_("Bus"))); - boost::shared_ptr<PortGroup> track (new PortGroup (_("Track"))); - boost::shared_ptr<PortGroup> system (new PortGroup (_("System"))); - boost::shared_ptr<PortGroup> ardour (new PortGroup (PROGRAM_NAME)); + boost::shared_ptr<PortGroup> bus (new PortGroup (string_compose (PROGRAM_NAME " %1", _("Busses")))); + boost::shared_ptr<PortGroup> track (new PortGroup (string_compose (PROGRAM_NAME " %1", _("Tracks")))); + boost::shared_ptr<PortGroup> system (new PortGroup (_("Hardware"))); + boost::shared_ptr<PortGroup> ardour (new PortGroup (string_compose (PROGRAM_NAME " %1", _("Misc")))); boost::shared_ptr<PortGroup> 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<boost::shared_ptr<IO> > used_io; boost::shared_ptr<IO> io = inputs ? (*i)->input() : (*i)->output(); |