smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 08:14:58 +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

18
gtk2_ardour/monitor_section.cc
View file

@ -1194,7 +1194,7 @@ bool
MonitorSection::cancel_isolate (GdkEventButton*)
{
if (_session) {
std::shared_ptr<RouteList> rl (_session->get_routes ());
std::shared_ptr<RouteList const> rl (_session->get_routes ());
_session->set_controls (route_list_to_control_list (rl, &Stripable::solo_isolate_control), 0.0, Controllable::NoGroup);
}
@ -1360,23 +1360,23 @@ MonitorSection::output_press (GdkEventButton *ev)
ARDOUR::BundleList current = _route->output()->bundles_connected ();
std::shared_ptr<ARDOUR::BundleList> b = _session->bundles ();
std::shared_ptr<ARDOUR::BundleList const> b = _session->bundles ();
/* give user bundles first chance at being in the menu */
for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
if (std::dynamic_pointer_cast<UserBundle> (*i)) {
maybe_add_bundle_to_output_menu (*i, current);
for (auto const& i : *b) {
if (std::dynamic_pointer_cast<UserBundle> (i)) {
maybe_add_bundle_to_output_menu (i, current);
}
}
for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
if (std::dynamic_pointer_cast<UserBundle> (*i) == 0) {
maybe_add_bundle_to_output_menu (*i, current);
for (auto const& i : *b) {
if (std::dynamic_pointer_cast<UserBundle> (i) == 0) {
maybe_add_bundle_to_output_menu (i, current);
}
}
std::shared_ptr<ARDOUR::RouteList> routes = _session->get_routes ();
std::shared_ptr<ARDOUR::RouteList const> routes = _session->get_routes ();
RouteList copy = *routes;
copy.sort (RouteCompareByName ());
for (ARDOUR::RouteList::const_iterator i = copy.begin(); i != copy.end(); ++i) {