From 0b5f2c5d5877de5787a884229f445bc52182f328 Mon Sep 17 00:00:00 2001 From: "Julien \"_FrnchFrgg_\" RIVAUD" Date: Tue, 19 Jul 2016 02:03:44 +0200 Subject: Don't add Bundles to PortMatrix if they only have mistyped ports PortMatrix is able to filter out ports that have an unwanted datatype, but if a Bundle is added that has no port at all with a wanted datatype then it is not weeded out correctly (and even if it were, there's no chance that it will legitimately appear in the UI). Don't add that kind of Bundle in the first place. --- gtk2_ardour/port_group.cc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'gtk2_ardour/port_group.cc') diff --git a/gtk2_ardour/port_group.cc b/gtk2_ardour/port_group.cc index f7b18156dc..084514363a 100644 --- a/gtk2_ardour/port_group.cc +++ b/gtk2_ardour/port_group.cc @@ -375,10 +375,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp /* Sort RouteIOs by the routes' editor order keys */ route_ios.sort (RouteIOsComparator ()); - /* Now put the bundles that belong to these sorted RouteIOs into the PortGroup. - Note that if the RouteIO's bundles are multi-type, we may make new Bundles - with only the ports of one type. - */ + /* Now put the bundles that belong to these sorted RouteIOs into the PortGroup. */ for (list::iterator i = route_ios.begin(); i != route_ios.end(); ++i) { TimeAxisView* tv = PublicEditor::instance().axis_view_from_stripable (i->route); @@ -392,10 +389,14 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp } for (list >::iterator j = i->ios.begin(); j != i->ios.end(); ++j) { - if (tv) { - g->add_bundle ((*j)->bundle(), *j, tv->color ()); - } else { - g->add_bundle ((*j)->bundle(), *j); + /* Only add the bundle if there is at least one port + * with a type that's been asked for */ + if (type == DataType::NIL || (*j)->bundle()->nchannels().n(type) > 0) { + if (tv) { + g->add_bundle ((*j)->bundle(), *j, tv->color ()); + } else { + g->add_bundle ((*j)->bundle(), *j); + } } } } -- cgit v1.2.3