summaryrefslogtreecommitdiff
path: root/libs/ardour/session.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2016-10-14 12:28:38 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2016-10-17 11:16:07 -0400
commit1fd7ec58cd34972195198e6fba0e30318189ccca (patch)
tree770e7adeb848f08e2972964c5bdb2608b6b3ed5d /libs/ardour/session.cc
parent46d137414be5d891e2cb4e0bfd6660eb1faa109b (diff)
use existing method rather than inline code for pending port deletions
Diffstat (limited to 'libs/ardour/session.cc')
-rw-r--r--libs/ardour/session.cc11
1 files 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<RouteList> 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<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;
- }
+ AudioEngine::instance()->clear_pending_port_deletions ();
pthread_cond_wait (&_auto_connect_cond, &_auto_connect_mutex);
}