smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 06:44:57 +01:00
Code Issues Projects Releases Wiki Activity

Make RCU reader return a const pointer (omnibus commit)

Browse source
This commit is contained in:
Robin Gareus 2023-04-07 23:33:13 +02:00
parent e9f71824a1
commit 295dbd8e1e
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
58 changed files with 745 additions and 776 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gtk2_ardour/port_group.cc
View file

@ -362,7 +362,7 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
order key.
*/
std::shared_ptr<RouteList> routes = session->get_routes ();
std::shared_ptr<RouteList const> routes = session->get_routes ();
list<RouteIOs> route_ios;
for (RouteList::const_iterator i = routes->begin(); i != routes->end(); ++i) {
@ -440,19 +440,19 @@ PortGroupList::gather (ARDOUR::Session* session, ARDOUR::DataType type, bool inp
that UserBundles that offer the same ports as a normal bundle get priority
*/
std::shared_ptr<BundleList> b = session->bundles ();
std::shared_ptr<BundleList const> b = session->bundles ();
for (BundleList::iterator i = b->begin(); i != b->end(); ++i) {
if (std::dynamic_pointer_cast<UserBundle> (*i) && (*i)->ports_are_inputs() == inputs) {
system->add_bundle (*i, allow_dups);
for (auto const& i : *b) {
if (std::dynamic_pointer_cast<UserBundle> (i) && i->ports_are_inputs() == inputs) {
system->add_bundle (i, allow_dups);
}
}
/* Only look for non-user bundles if instructed to do so */
if (use_session_bundles) {
for (BundleList::iterator i = b->begin(); i != b->end(); ++i) {
if (std::dynamic_pointer_cast<UserBundle> (*i) == 0 && (*i)->ports_are_inputs() == inputs) {
system->add_bundle (*i, allow_dups);
for (auto const& i : *b) {
if (std::dynamic_pointer_cast<UserBundle> (i) == 0 && i->ports_are_inputs() == inputs) {
system->add_bundle (i, allow_dups);
}
}
}