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/audio_playlist.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/audio_playlist.cc')
| -rw-r--r-- | libs/ardour/audio_playlist.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index bd09af4e1f..6a27541bcd 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -663,17 +663,15 @@ bool AudioPlaylist::destroy_region (boost::shared_ptr<Region> region) { boost::shared_ptr<AudioRegion> r = boost::dynamic_pointer_cast<AudioRegion> (region); + + if (!r) { + return false; + } + bool changed = false; Crossfades::iterator c, ctmp; set<boost::shared_ptr<Crossfade> > unique_xfades; - if (r == 0) { - fatal << _("programming error: non-audio Region passed to remove_overlap in audio playlist") - << endmsg; - /*NOTREACHED*/ - return false; - } - { RegionLock rlock (this); |