ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Optimize Route::direct_feeds_according_to_reality

Browse Source 
Consolidate duplicate function calls, cache result in local variable.
This commit is contained in:
Robin Gareus 2022-05-05 17:07:15 +02:00
parent 44bb8caa65
commit 5fa7d481c1
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/ardour/io.cc
View File

@ -1624,10 +1624,10 @@ IO::connected_to (boost::shared_ptr<const IO> other) const
for (i = 0; i < no; ++i) {
for (j = 0; j < ni; ++j) {
if ((NULL != nth(i).get()) && (NULL != other->nth(j).get())) {
if (nth(i)->connected_to (other->nth(j)->name())) {
return true;
}
boost::shared_ptr<Port> pa (nth(i));
boost::shared_ptr<Port> pb (other->nth(j));
if (pa && pb && pa->connected_to (pb->name())) {
return true;
}
}
}

6
libs/ardour/route.cc
View File

@ -3580,8 +3580,10 @@ Route::direct_feeds_according_to_reality (boost::shared_ptr<GraphNode> node, boo
boost::shared_ptr<Route> other (boost::dynamic_pointer_cast<Route> (node));
assert (other);
IOVector const& other_inputs (other->all_inputs());
DEBUG_TRACE (DEBUG::Graph, string_compose ("Feeds from %1 (-> %2)?\n", _name, other->name()));
if (other->all_inputs().fed_by (_output)) {
if (other_inputs.fed_by (_output)) {
DEBUG_TRACE (DEBUG::Graph, string_compose ("\tdirect FEEDS to %1\n", other->name()));
if (via_send_only) {
*via_send_only = false;
@ -3608,7 +3610,7 @@ Route::direct_feeds_according_to_reality (boost::shared_ptr<GraphNode> node, boo
DEBUG_TRACE (DEBUG::Graph, string_compose ("\tIOP %1 does feed its own return (%2)\n", iop->name(), other->name()));
continue;
}
if ((iop_out && other->all_inputs().fed_by (iop_out)) || iop->feeds (other)) {
if (iop->feeds (other) || (iop_out && other_inputs.fed_by (iop_out))) {
DEBUG_TRACE (DEBUG::Graph, string_compose ("\tIOP %1 does feed %2\n", iop->name(), other->name()));
if (via_send_only) {
*via_send_only = true;