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.
This commit is contained in:
parent
f5ed0c6d07
commit
0b5f2c5d58
@ -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<RouteIOs>::iterator i = route_ios.begin(); i != route_ios.end(); ++i) {
|
||||
TimeAxisView* tv = PublicEditor::instance().axis_view_from_stripable (i->route);
|
||||
@ -392,6 +389,9 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
|
||||
}
|
||||
|
||||
for (list<boost::shared_ptr<IO> >::iterator j = i->ios.begin(); j != i->ios.end(); ++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 {
|
||||
@ -399,6 +399,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Bundles owned by the session; add user bundles first, then normal ones, so
|
||||
that UserBundles that offer the same ports as a normal bundle get priority
|
||||
|
Loading…
Reference in New Issue
Block a user