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

1 files changed, 3 insertions, 5 deletions

diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h
index c089a39736..d0d2bcbc36 100644
--- a/libs/ardour/ardour/diskstream.h
+++ b/libs/ardour/ardour/diskstream.h
@@ -45,7 +45,7 @@ namespace ARDOUR {
 class IO;
 class Playlist;
 class Processor;
-class Region;
+class Source;
 class Session;
 class Track;
 class Location;	
@@ -134,12 +134,10 @@ class Diskstream : public SessionObject, public PublicDiskstream
 
 	int set_loop (Location *loc);
 
-	std::list<boost::shared_ptr<Region> >& last_capture_regions () { return _last_capture_regions; }
+	std::list<boost::shared_ptr<Source> >& last_capture_sources () { return _last_capture_sources; }
 
 	void handle_input_change (IOChange, void *src);
 
-	void remove_region_from_last_capture (boost::weak_ptr<Region> wregion);
-
 	void move_processor_automation (boost::weak_ptr<Processor>,
 			std::list<Evoral::RangeMove<framepos_t> > const &);
 
@@ -228,7 +226,7 @@ class Diskstream : public SessionObject, public PublicDiskstream
 
 	virtual bool realtime_set_speed (double, bool global_change);
 
-	std::list<boost::shared_ptr<Region> > _last_capture_regions;
+	std::list<boost::shared_ptr<Source> > _last_capture_sources;
 
 	virtual int use_pending_capture_data (XMLNode& node) = 0;