diff options
| author | Robin Gareus <robin@gareus.org> | 2016-04-03 23:51:59 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-04-03 23:51:59 +0200 |
| commit | e84453e8786052790629e8a7323441a3ab5309c8 (patch) | |
| tree | 4942d6abd1929b9549328747a7f694ccc0d16009 /libs/ardour/route.cc | |
| parent | 56352723d8388d0eb1f2c93c9ed84b00226ab7c3 (diff) | |
cement daa10a6a38
Diffstat (limited to 'libs/ardour/route.cc')
| -rw-r--r-- | libs/ardour/route.cc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 959b546def..01ab80f9dc 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -3632,12 +3632,7 @@ bool Route::direct_feeds_according_to_reality (boost::shared_ptr<Route> other, bool* via_send_only) { DEBUG_TRACE (DEBUG::Graph, string_compose ("Feeds? %1\n", _name)); -#if 0 - if (_output->connected_to (other->input())) -#else - if (other->all_inputs().fed_by (_output)) -#endif - { + if (other->all_inputs().fed_by (_output)) { DEBUG_TRACE (DEBUG::Graph, string_compose ("\tdirect FEEDS %2\n", other->name())); if (via_send_only) { *via_send_only = false; @@ -3658,13 +3653,8 @@ Route::direct_feeds_according_to_reality (boost::shared_ptr<Route> other, bool* } if (iop != 0) { -#if 0 - if (iop->feeds (other)) -#else boost::shared_ptr<const IO> iop_out = iop->output(); - if (iop_out && other->all_inputs().fed_by (iop_out)) -#endif - { + if (iop_out && other->all_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; |