smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-23 23:17:46 +01:00
Code Issues Projects Releases Wiki Activity

when cleaning up sources, do not remove "stub" sources from the source list, even though they do not exist on disk yet; remove some debug output

Browse source
This commit is contained in:
Paul Davis 2014-02-07 17:38:42 -05:00
parent f715cd877c
commit d47fe167e3
1 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

36
libs/ardour/session_state.cc
View file

@ -987,19 +987,9 @@ Session::state (bool full_state)
if (!fs->destructive()) {
if (fs->empty() && !fs->used()) {
#ifndef NDEBUG
cerr << "DEBUG: source '"
<< fs->name() << "' id: "
<< fs->id() << " is marked as empty and unused and is not saved.\n";
#endif
continue;
}
}
#ifndef NDEBUG
cerr << "DEBUG: saving source '"
<< fs->name() << "' id: "
<< fs->id() << ".\n";
#endif
child->add_child_nocopy (siter->second->get_state());
}
@ -2710,19 +2700,23 @@ Session::cleanup_sources (CleanupReport& rep)
++tmp;
if ((fs = boost::dynamic_pointer_cast<FileSource> (i->second)) != 0) {
if (playlists->source_use_count (fs) != 0) {
all_sources.insert (fs->path());
} else {
/* we might not remove this source from disk, because it may be used
by other snapshots, but its not being used in this version
so lets get rid of it now, along with any representative regions
in the region list.
*/
if (!fs->is_stub()) {
RegionFactory::remove_regions_using_source (i->second);
sources.erase (i);
}
if (playlists->source_use_count (fs) != 0) {
all_sources.insert (fs->path());
} else {
/* we might not remove this source from disk, because it may be used
by other snapshots, but its not being used in this version
so lets get rid of it now, along with any representative regions
in the region list.
*/
RegionFactory::remove_regions_using_source (i->second);
sources.erase (i);
}
}
}
i = tmp;