auto-fy another PortGroup::gather loop + no main outs for livetrax, part 2
This commit is contained in:
parent
44ee16a5ac
commit
cb5a9f11dc
@ -324,8 +324,10 @@ PortGroupList::maybe_add_processor_to_list (std::weak_ptr<Processor> wp, list<st
|
|||||||
struct RouteIOs {
|
struct RouteIOs {
|
||||||
RouteIOs (std::shared_ptr<Route> r, std::shared_ptr<IO> i) {
|
RouteIOs (std::shared_ptr<Route> r, std::shared_ptr<IO> i) {
|
||||||
route = r;
|
route = r;
|
||||||
|
if (i) {
|
||||||
ios.push_back (i);
|
ios.push_back (i);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
std::shared_ptr<Route> route;
|
std::shared_ptr<Route> route;
|
||||||
/* it's ok to use a shared_ptr here as RouteIOs structs are only used during ::gather () */
|
/* 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 ();
|
std::shared_ptr<RouteList const> routes = session->get_routes ();
|
||||||
list<RouteIOs> route_ios;
|
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 */
|
/* we never show the monitor bus inputs */
|
||||||
|
|
||||||
if (inputs && (*i)->is_monitor()) {
|
if (inputs && r->is_monitor()) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -385,12 +387,20 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
set<std::shared_ptr<IO> > used_io;
|
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);
|
used_io.insert (io);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
io = inputs ? r->input() : r->output();
|
||||||
|
used_io.insert (io);
|
||||||
|
#endif
|
||||||
|
|
||||||
RouteIOs rb (*i, io);
|
RouteIOs rb (r, io);
|
||||||
(*i)->foreach_processor (boost::bind (&PortGroupList::maybe_add_processor_to_list, this, _1, &rb.ios, inputs, used_io));
|
r->foreach_processor (boost::bind (&PortGroupList::maybe_add_processor_to_list, this, _1, &rb.ios, inputs, used_io));
|
||||||
|
|
||||||
route_ios.push_back (rb);
|
route_ios.push_back (rb);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user