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

cement daa10a6a38

Browse Source
This commit is contained in:
Robin Gareus 2016-04-03 23:51:59 +02:00
parent 56352723d8
commit e84453e878
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/io_vector.h
View File

@ -29,6 +29,7 @@ namespace ARDOUR {
class IOVector : public std::vector<boost::weak_ptr<ARDOUR::IO> >
{
public:
#if 0 // unused -- for future reference
bool connected_to (const IOVector& other) const {
for (IOVector::const_iterator i = other.begin(); i != other.end(); ++i) {
boost::shared_ptr<const IO> io = i->lock();
@ -50,6 +51,7 @@ public:
}
return false;
}
#endif
bool fed_by (boost::shared_ptr<const IO> other) const {
for (IOVector::const_iterator i = begin(); i != end(); ++i) {

14
libs/ardour/route.cc
View File

@ -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;