smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-28 16:08:12 +01:00
Code Issues Projects Releases Wiki Activity

Speedup deletion of Busses, specifically the monitor section

Browse source 
Deleting sends to busses now only takes the process lock once.
This commit is contained in:
Robin Gareus 2026-01-27 00:24:12 +01:00
parent 6c93112a7e
commit 77844b1d09
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

31
libs/ardour/session.cc
View file

@ -3868,24 +3868,29 @@ Session::remove_routes (std::shared_ptr<RouteList> routes_to_remove)
(*iter)->input()->disconnect (0);
(*iter)->output()->disconnect (0);
/* if the route had internal sends sending to it, remove them */
if (!deletion_in_progress ()) {
Glib::Threads::Mutex::Lock lx (AudioEngine::instance()->process_lock (), Glib::Threads::NOT_LOCK);
ProcessorChangeBlocker pcb (this, false);
if (!deletion_in_progress () && (*iter)->internal_return()) {
if ((*iter)->internal_return() || (_monitor_out && (*iter)->can_monitor ())) {
lx.acquire ();
}
std::shared_ptr<RouteList const> r = routes.reader ();
for (auto const& i : *r) {
std::shared_ptr<Send> s = i->internal_send_for (*iter);
if (s) {
i->remove_processor (s);
/* if the route had internal sends sending to it, remove them */
if ((*iter)->internal_return()) {
std::shared_ptr<RouteList const> r = routes.reader ();
for (auto const& i : *r) {
std::shared_ptr<Send> s = i->internal_send_for (*iter);
if (s) {
i->remove_processor (s, nullptr, false);
}
}
}
}
/* if the monitoring section had a pointer to this route, remove it */
if (!deletion_in_progress () && _monitor_out && (*iter)->can_monitor ()) {
Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
ProcessorChangeBlocker pcb (this, false);
(*iter)->remove_monitor_send ();
/* if the monitoring section had a pointer to this route, remove it */
if (_monitor_out && (*iter)->can_monitor ()) {
(*iter)->remove_monitor_send ();
}
}
std::shared_ptr<MidiTrack> mt = std::dynamic_pointer_cast<MidiTrack> (*iter);