13
0

use existing method rather than inline code for pending port deletions

This commit is contained in:
Paul Davis 2016-10-14 12:28:38 -04:00
parent 46d137414b
commit 1fd7ec58cd

View File

@ -3719,6 +3719,7 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove)
*/ */
for (RouteList::iterator iter = routes_to_remove->begin(); iter != routes_to_remove->end(); ++iter) { for (RouteList::iterator iter = routes_to_remove->begin(); iter != routes_to_remove->end(); ++iter) {
cerr << "Drop references to " << (*iter)->name() << endl;
(*iter)->drop_references (); (*iter)->drop_references ();
} }
@ -7090,15 +7091,7 @@ Session::auto_connect_thread_run ()
} }
} }
std::cerr << "Autoconnect thread checking port deletions ...\n"; AudioEngine::instance()->clear_pending_port_deletions ();
RingBuffer<Port*>& ports (AudioEngine::instance()->port_deletions_pending());
Port* p;
while (ports.read (&p, 1) == 1) {
std::cerr << "autoconnect deletes " << p->name() << std::endl;
delete p;
}
pthread_cond_wait (&_auto_connect_cond, &_auto_connect_mutex); pthread_cond_wait (&_auto_connect_cond, &_auto_connect_mutex);
} }