diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-06-23 20:14:07 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-06-23 20:14:07 +0000 |
| commit | f4401c59284258c6aa56707da64e3da32756329f (patch) | |
| tree | 73679199ae43516347d607adad212c10612f7eb9 /libs/ardour/session_state.cc | |
| parent | cac03dbeb6ebdcd406385dd14a746cb8c51dd5f8 (diff) | |
midway snapshot of work done on managing Region & Source lifetimes correctly. may fix missing MIDI file bug ; save empty playlists because they may be referred to by the history file ; undo commands auto-delete when objects they refer to die (currently not commands built from XML deserialization); Sources now know how many regions are using them for something, meaning that we know if we can delete the files holding any data for the source
git-svn-id: svn://localhost/ardour2/branches/3.0@7291 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/session_state.cc')
| -rw-r--r-- | libs/ardour/session_state.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index a490bb10c9..0f8583a822 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -1040,13 +1040,18 @@ Session::state(bool full_state) for (SourceMap::iterator siter = sources.begin(); siter != sources.end(); ++siter) { - /* Don't save information about non-destructive file sources that are empty */ - /* FIXME: MIDI breaks if this is made FileSource like it should be... */ + /* Don't save information about non-destructive file sources that are empty + and unused by any regions. + */ - boost::shared_ptr<AudioFileSource> fs; - if ((fs = boost::dynamic_pointer_cast<AudioFileSource> (siter->second)) != 0) { + cerr << "Source " << siter->second->name() << " has UC = " << siter->second->used() + << " length = " << siter->second->length (0) + << endl; + + boost::shared_ptr<FileSource> fs; + if ((fs = boost::dynamic_pointer_cast<FileSource> (siter->second)) != 0) { if (!fs->destructive()) { - if (fs->length(fs->timeline_position()) == 0) { + if (fs->length(fs->timeline_position()) == 0 && !fs->used()) { continue; } } |