diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-03-17 20:54:03 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-03-17 20:54:03 +0000 |
| commit | 997e4b1f9cd7ccfc704b7c035051da7f60d831e7 (patch) | |
| tree | 1236e40183b677abf4a2882e4cfe8e0a345eb24d /libs/ardour/session.cc | |
| parent | 19a4b990325577fc949ccd5d5fbad4520eb1df56 (diff) | |
merge with 2.0-ongoing @ rev 3147
git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session.cc')
| -rw-r--r-- | libs/ardour/session.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index ae41f3c0dc..71d7a07748 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -431,14 +431,13 @@ Session::destroy () tmp = i; ++tmp; - + i->second->drop_references (); - + i = tmp; } - sources.clear (); - + #ifdef TRACK_DESTRUCTION cerr << "delete mix groups\n"; #endif /* TRACK_DESTRUCTION */ @@ -684,7 +683,7 @@ Session::when_engine_running () add_bundle (c); } - BootMessage (_("Connect ports")); + BootMessage (_("Setup signal flow and plugins")); hookup_io (); @@ -2835,6 +2834,8 @@ Session::remove_source (boost::weak_ptr<Source> src) return; } + cerr << "remove source for " << source->name() << endl; + { Glib::Mutex::Lock lm (source_lock); @@ -4165,7 +4166,7 @@ Session::get_silent_buffers (ChanCount count) _silent_buffers->set_count(count); for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { - for (size_t i=0; i < count.get(*t); ++i) { + for (size_t i= 0; i < count.get(*t); ++i) { _silent_buffers->get(*t, i).clear(); } } |