diff options
| author | David Robillard <d@drobilla.net> | 2008-02-22 01:45:29 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-02-22 01:45:29 +0000 |
| commit | faf4e1d8e863477a13b6c3e3c04d76fbd8011c61 (patch) | |
| tree | bcb4d4ea2859b447c283b4465e0d410c32f61dbf /libs | |
| parent | 2921166139ee036b71e4d08b5eb7816fdd4739f2 (diff) | |
Clean up weird formatting from underlays patch.
Fix several memory (valgrind) errors in a vain attempt to fix crash on session close.
git-svn-id: svn://localhost/ardour2/branches/3.0@3105 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/region_factory.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc index bb40fb16cf..bd4b0873a7 100644 --- a/libs/ardour/region_factory.cc +++ b/libs/ardour/region_factory.cc @@ -108,8 +108,6 @@ RegionFactory::create (Session& session, XMLNode& node, bool yn) boost::shared_ptr<Region> RegionFactory::create (const SourceList& srcs, nframes_t start, nframes_t length, const string& name, layer_t layer, Region::Flag flags, bool announce) { - cerr << "CREATE REGION " << name << " " << start << " * " << length << endl; - if (srcs.empty()) { return boost::shared_ptr<Region>(); } diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 52cfc093cc..ae41f3c0dc 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -334,6 +334,8 @@ Session::destroy () AudioDiskstream::free_working_buffers(); + Route::SyncOrderKeys.clear(); + #undef TRACK_DESTRUCTION #ifdef TRACK_DESTRUCTION cerr << "delete named selections\n"; @@ -396,7 +398,7 @@ Session::destroy () #ifdef TRACK_DESTRUCTION cerr << "delete routes\n"; #endif /* TRACK_DESTRUCTION */ - { + { RCUWriter<RouteList> writer (routes); boost::shared_ptr<RouteList> r = writer.get_copy (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { |