Speed up session deletion

No need to reconfigure routes due to removal of monitor or aux
send/return. The processors will be removed with the route.
This commit is contained in:
Robin Gareus 2019-03-17 17:35:10 +01:00
parent 3fa3437c38
commit 66103be9f2
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 3 additions and 2 deletions

View File

@ -1174,7 +1174,7 @@ Session::remove_monitor_section ()
*/
cancel_audition ();
{
if (!deletion_in_progress ()) {
/* Hold process lock while doing this so that we don't hear bits and
* pieces of audio as we work on each route.
*/
@ -3769,7 +3769,8 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove)
(*iter)->output()->disconnect (0);
/* if the route had internal sends sending to it, remove them */
if ((*iter)->internal_return()) {
if (!deletion_in_progress () && (*iter)->internal_return()) {
boost::shared_ptr<RouteList> r = routes.reader ();
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {