From daa10a6a38638da3b9c5e6de615367e44ccf4e4c Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 3 Apr 2016 20:24:14 +0200 Subject: Fix graph ordering incl. Inserts, Returns and SideChains When building the process graph. Ardour usess Route::direct_feeds_according_to_reality() This function only tests if the current route (or any ioprocessors) is feeding another route's *input*. Inserts, Return and now Sidechains are ignored as destinations on the destination route are not taken into account. This is now resolved by adding an IOVector, a collection of all inputs of the destination route. --- libs/ardour/ardour/io_vector.h | 69 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 libs/ardour/ardour/io_vector.h (limited to 'libs/ardour/ardour/io_vector.h') diff --git a/libs/ardour/ardour/io_vector.h b/libs/ardour/ardour/io_vector.h new file mode 100644 index 0000000000..ef100702c7 --- /dev/null +++ b/libs/ardour/ardour/io_vector.h @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2016 Robin Gareus + * Copyright (C) 2006 Paul Davis + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef __ardour_io_vector_h__ +#define __ardour_io_vector_h__ + +#include +#include +#include "ardour/io.h" + +namespace ARDOUR { + +class IOVector : public std::vector > +{ +public: + bool connected_to (const IOVector& other) const { + for (IOVector::const_iterator i = other.begin(); i != other.end(); ++i) { + boost::shared_ptr io = i->lock(); + if (!io) continue; + if (connected_to (io)) { + return true; + } + } + return false; + } + + bool connected_to (boost::shared_ptr other) const { + for (IOVector::const_iterator i = begin(); i != end(); ++i) { + boost::shared_ptr io = i->lock(); + if (!io) continue; + if (io->connected_to (other)) { + return true; + } + } + return false; + } + + bool fed_by (boost::shared_ptr other) const { + for (IOVector::const_iterator i = begin(); i != end(); ++i) { + boost::shared_ptr io = i->lock(); + if (!io) continue; + if (other->connected_to (io)) { + return true; + } + } + return false; + } +}; + +} // namespace ARDOUR + + +#endif -- cgit v1.2.3