From 1fd7ec58cd34972195198e6fba0e30318189ccca Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 14 Oct 2016 12:28:38 -0400 Subject: [PATCH] use existing method rather than inline code for pending port deletions --- libs/ardour/session.cc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 65e810f48e..ce86483d75 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -3719,6 +3719,7 @@ Session::remove_routes (boost::shared_ptr routes_to_remove) */ for (RouteList::iterator iter = routes_to_remove->begin(); iter != routes_to_remove->end(); ++iter) { + cerr << "Drop references to " << (*iter)->name() << endl; (*iter)->drop_references (); } @@ -7090,15 +7091,7 @@ Session::auto_connect_thread_run () } } - std::cerr << "Autoconnect thread checking port deletions ...\n"; - - RingBuffer& ports (AudioEngine::instance()->port_deletions_pending()); - Port* p; - - while (ports.read (&p, 1) == 1) { - std::cerr << "autoconnect deletes " << p->name() << std::endl; - delete p; - } + AudioEngine::instance()->clear_pending_port_deletions (); pthread_cond_wait (&_auto_connect_cond, &_auto_connect_mutex); }