ardour/livetrax
13
0
Fork 0
Code

auto-fy another PortGroup::gather loop + no main outs for livetrax, part 2

Browse Source
This commit is contained in:
Paul Davis 2024-05-29 22:37:27 -06:00
parent 44ee16a5ac
commit cb5a9f11dc
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk2_ardour/port_group.cc
View File

@ -324,8 +324,10 @@ PortGroupList::maybe_add_processor_to_list (std::weak_ptr<Processor> wp, list<st
struct RouteIOs {
RouteIOs (std::shared_ptr<Route> r, std::shared_ptr<IO> i) {
route = r;
if (i) {
ios.push_back (i);
}
}
std::shared_ptr<Route> route;
/* it's ok to use a shared_ptr here as RouteIOs structs are only used during ::gather () */
@ -371,11 +373,11 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
std::shared_ptr<RouteList const> routes = session->get_routes ();
list<RouteIOs> route_ios;
for (RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) {
for (auto const & r : *routes) {
/* we never show the monitor bus inputs */
if (inputs && (*i)->is_monitor()) {
if (inputs && r->is_monitor()) {
continue;
}
@ -385,12 +387,20 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
*/
set<std::shared_ptr<IO> > used_io;
std::shared_ptr<IO> io = inputs ? (*i)->input() : (*i)->output();
std::shared_ptr<IO> io;
#ifdef LIVETRAX
if (inputs) {
io = r->input();
used_io.insert (io);
}
#else
io = inputs ? r->input() : r->output();
used_io.insert (io);
#endif
RouteIOs rb (*i, io);
(*i)->foreach_processor (boost::bind (&PortGroupList::maybe_add_processor_to_list, this, _1, &rb.ios, inputs, used_io));
RouteIOs rb (r, io);
r->foreach_processor (boost::bind (&PortGroupList::maybe_add_processor_to_list, this, _1, &rb.ios, inputs, used_io));
route_ios.push_back (rb);
}