diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-25 21:06:52 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-25 21:06:52 +0000 |
| commit | b6f4cdaea27fbf49f924b2684d4c638089314067 (patch) | |
| tree | 4328e93333d13eccadc18455ba32a7293d3cbd73 /libs/ardour/session.cc | |
| parent | f53cbaede885cd52b8fee59890e33575a4fc11fa (diff) | |
rationalize destruction pathway (some more); tidy-ify some ImageFrame code
git-svn-id: svn://localhost/ardour2/branches/3.0@6398 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session.cc')
| -rw-r--r-- | libs/ardour/session.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 0bbd1834b4..f0d69fec28 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -362,9 +362,7 @@ Session::destroy () Stateful::loading_state_version = 0; - _butler->terminate_thread (); delete _butler; - delete midi_control_ui; if (click_data != default_click) { @@ -425,8 +423,9 @@ Session::destroy () /* writer goes out of scope and updates master */ } routes.flush (); - extern void boost_debug_count_ptrs (); - boost_debug_count_ptrs (); + + boost::shared_ptr<RouteList> r = routes.reader (); + cerr << "\n\n\n AFTER ROUTE CLEARING, there are " << r->size() << " routes in RCU\n"; DEBUG_TRACE (DEBUG::Destruction, "delete diskstreams\n"); { |