major changes to Region, AudioRegion, Playlist, AudioPlaylist and Crossfade state management, to try to fix undo/redo. Not finished, butthe speedups etc. are in place

git-svn-id: svn://localhost/ardour2/trunk@993 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 39 insertions, 213 deletions

diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index 2d2f4e5365..e39be5d402 100644
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -39,10 +39,6 @@ using namespace sigc;
 using namespace std;
 using namespace PBD;
 
-AudioPlaylist::State::~State ()
-{
-}
-
 AudioPlaylist::AudioPlaylist (Session& session, const XMLNode& node, bool hidden)
 	: Playlist (session, node, hidden)
 {
@@ -50,8 +46,6 @@ AudioPlaylist::AudioPlaylist (Session& session, const XMLNode& node, bool hidden
 	set_state (node);
 	in_set_state = false;
 
-	save_state (_("initial state"));
-
 	if (!hidden) {
 		PlaylistCreated (this); /* EMIT SIGNAL */
 	}
@@ -60,8 +54,6 @@ AudioPlaylist::AudioPlaylist (Session& session, const XMLNode& node, bool hidden
 AudioPlaylist::AudioPlaylist (Session& session, string name, bool hidden)
 	: Playlist (session, name, hidden)
 {
-	save_state (_("initial state"));
-
 	if (!hidden) {
 		PlaylistCreated (this); /* EMIT SIGNAL */
 	}
@@ -71,8 +63,6 @@ AudioPlaylist::AudioPlaylist (Session& session, string name, bool hidden)
 AudioPlaylist::AudioPlaylist (const AudioPlaylist& other, string name, bool hidden)
 	: Playlist (other, name, hidden)
 {
-	save_state (_("initial state"));
-
 	RegionList::const_iterator in_o  = other.regions.begin();
 	RegionList::iterator in_n = regions.begin();
 
@@ -118,8 +108,6 @@ AudioPlaylist::AudioPlaylist (const AudioPlaylist& other, string name, bool hidd
 AudioPlaylist::AudioPlaylist (const AudioPlaylist& other, nframes_t start, nframes_t cnt, string name, bool hidden)
 	: Playlist (other, start, cnt, name, hidden)
 {
-	save_state (_("initial state"));
-
 	/* this constructor does NOT notify others (session) */
 }
 
@@ -134,24 +122,7 @@ AudioPlaylist::~AudioPlaylist ()
 	notify_callbacks ();
 
 	for (Crossfades::iterator x = _crossfades.begin(); x != _crossfades.end(); ++x) {
-		all_xfades.insert (*x);
-	}
-
-	for (StateMap::iterator i = states.begin(); i != states.end(); ++i) {
-		
-		AudioPlaylist::State* apstate = dynamic_cast<AudioPlaylist::State*> (*i);
-
-	for (Crossfades::iterator xf = apstate->crossfades.begin(); xf != apstate->crossfades.end(); ++xf) {
-			all_xfades.insert (*xf);
-		}
-
-		delete apstate;
-	}
-
-	/* delete every crossfade */
-
-	for (set<Crossfade *>::iterator axf = all_xfades.begin(); axf != all_xfades.end(); ++axf) {
-		delete *axf;
+		delete *x;
 	}
 }
 
@@ -447,7 +418,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
 					add_crossfade (*xfade);
 					
 				} else {
-		
+
 					xfade = new Crossfade (other, region, Config->get_xfade_model(), Config->get_crossfades_active());
 					add_crossfade (*xfade);
 				}
@@ -519,7 +490,7 @@ AudioPlaylist::set_state (const XMLNode& node)
 
 	if (!in_set_state) {
 		Playlist::set_state (node);
-	}
+	} 
 
 	nlist = node.children();
 
@@ -527,155 +498,60 @@ AudioPlaylist::set_state (const XMLNode& node)
 
 		child = *niter;
 
-		if (child->name() == "Crossfade") {
-
-			Crossfade *xfade;
-			
-			try {
-				xfade = new Crossfade (*((const Playlist *)this), *child);
-			}
-
-			catch (failed_constructor& err) {
-			  //	cout << string_compose (_("could not create crossfade object in playlist %1"),
-			  //	  _name) 
-			  //    << endl;
-				continue;
-			}
-
-			Crossfades::iterator ci;
-
-			for (ci = _crossfades.begin(); ci != _crossfades.end(); ++ci) {
-				if (*(*ci) == *xfade) {
-					break;
-				}
-			}
-
-			if (ci == _crossfades.end()) {
-				_crossfades.push_back (xfade);
-				xfade->Invalidated.connect (mem_fun (*this, &AudioPlaylist::crossfade_invalidated));
-				xfade->StateChanged.connect (mem_fun (*this, &AudioPlaylist::crossfade_changed));
-				NewCrossfade(xfade);
-			} else {
-				delete xfade;
-			}
+		if (child->name() != "Crossfade") {
+			continue;
 		}
 
-	}
-
-	return 0;
-}
-
-void
-AudioPlaylist::drop_all_states ()
-{
-	set<Crossfade*> all_xfades;
-	set<boost::shared_ptr<Region> > all_regions;
-
-	/* find every region we've ever used, and add it to the set of 
-	   all regions. same for xfades;
-	*/
-
-	for (StateMap::iterator i = states.begin(); i != states.end(); ++i) {
+		Crossfade *xfade;
 		
-		AudioPlaylist::State* apstate = dynamic_cast<AudioPlaylist::State*> (*i);
-
-		for (RegionList::iterator r = apstate->regions.begin(); r != apstate->regions.end(); ++r) {
-			all_regions.insert (*r);
-		}
-
-		for (Crossfades::iterator xf = apstate->crossfades.begin(); xf != apstate->crossfades.end(); ++xf) {
-			all_xfades.insert (*xf);
+		try {
+			xfade = new Crossfade (*((const Playlist *)this), *child);
 		}
-	}
-
-	/* now remove from the "all" lists every region that is in the current list. */
-
-	for (RegionList::iterator i = regions.begin(); i != regions.end(); ++i) {
-		set<boost::shared_ptr<Region> >::iterator x = all_regions.find (*i);
-		if (x != all_regions.end()) {
-			all_regions.erase (x);
+		
+		catch (failed_constructor& err) {
+			//	cout << string_compose (_("could not create crossfade object in playlist %1"),
+			//	  _name) 
+			//    << endl;
+			continue;
 		}
-	}
-
-	/* ditto for every crossfade */
-
-	for (list<Crossfade*>::iterator i = _crossfades.begin(); i != _crossfades.end(); ++i) {
-		set<Crossfade*>::iterator x = all_xfades.find (*i);
-		if (x != all_xfades.end()) {
-			all_xfades.erase (x);
+		
+		Crossfades::iterator ci;
+		
+		for (ci = _crossfades.begin(); ci != _crossfades.end(); ++ci) {
+			if (*(*ci) == *xfade) {
+				break;
+			}
 		}
-	}
-
-	/* delete every crossfade that is left (ditto as per regions) */
-
-	for (set<Crossfade *>::iterator axf = all_xfades.begin(); axf != all_xfades.end(); ++axf) {
-		delete *axf;
-	}
-
-	/* Now do the generic thing ... */
-
-	StateManager::drop_all_states ();
-}
-
-StateManager::State*
-AudioPlaylist::state_factory (std::string why) const
-{
-	State* state = new State (why);
-
-	state->regions = regions;
-	state->region_states.clear ();
-	for (RegionList::const_iterator i = regions.begin(); i != regions.end(); ++i) {
-		state->region_states.push_back ((*i)->get_memento());
-	}
-
-	state->crossfades = _crossfades;
-	state->crossfade_states.clear ();
-	for (Crossfades::const_iterator i = _crossfades.begin(); i != _crossfades.end(); ++i) {
-		state->crossfade_states.push_back ((*i)->get_memento());
-	}
-	return state;
-}
-
-Change
-AudioPlaylist::restore_state (StateManager::State& state)
-{ 
-	{ 
-		RegionLock rlock (this);
-		State* apstate = dynamic_cast<State*> (&state);
-
-		in_set_state = true;
+		
+		if (ci == _crossfades.end()) {
+			_crossfades.push_back (xfade);
+			xfade->Invalidated.connect (mem_fun (*this, &AudioPlaylist::crossfade_invalidated));
+			xfade->StateChanged.connect (mem_fun (*this, &AudioPlaylist::crossfade_changed));
+			NewCrossfade(xfade);
+		} else {
 
-		regions = apstate->regions;
+			/* adjust the current state of the existing crossfade */
 
-		for (list<UndoAction>::iterator s = apstate->region_states.begin(); s != apstate->region_states.end(); ++s) {
-			(*s) ();
-		}
+			(*ci)->set_state (*child);
 
-		_crossfades = apstate->crossfades;
-		
-		for (list<UndoAction>::iterator s = apstate->crossfade_states.begin(); s != apstate->crossfade_states.end(); ++s) {
-			(*s) ();
+			/* drop the new one */
+			delete xfade;
 		}
-
-		in_set_state = false;
 	}
 
-	notify_length_changed ();
-	return Change (~0);
-}
-
-UndoAction
-AudioPlaylist::get_memento () const
-{
-	return sigc::bind (mem_fun (*(const_cast<AudioPlaylist*> (this)), &StateManager::use_state), _current_state_id);
+	return 0;
 }
 
 void
-AudioPlaylist::clear (bool with_save)
+AudioPlaylist::clear ()
 {
+	for (Crossfades::iterator i = _crossfades.begin(); i != _crossfades.end(); ++i) {
+		delete *i;
+	}
+
 	_crossfades.clear ();
 	
-	Playlist::clear (with_save);
+	Playlist::clear ();
 }
 
 XMLNode&
@@ -776,52 +652,6 @@ AudioPlaylist::destroy_region (boost::shared_ptr<Region> region)
 		c = ctmp;
 	}
 
-	for (StateMap::iterator s = states.begin(); s != states.end(); ) {
-		StateMap::iterator tmp;
-
-		tmp = s;
-		++tmp;
-
-		State* astate = dynamic_cast<State*> (*s);
-		
-		for (c = astate->crossfades.begin(); c != astate->crossfades.end(); ) {
-
-			ctmp = c;
-			++ctmp;
-
-			if ((*c)->involves (r)) {
-				unique_xfades.insert (*c);
-				_crossfades.erase (c);
-			}
-
-			c = ctmp;
-		}
-
-		list<UndoAction>::iterator rsi, rsitmp;
-		RegionList::iterator ri, ritmp;
-
-		for (ri = astate->regions.begin(), rsi = astate->region_states.begin(); 
-		     ri != astate->regions.end() && rsi != astate->region_states.end();) {
-
-
-			ritmp = ri;
-			++ritmp;
-
-			rsitmp = rsi; 
-			++rsitmp;
-
-			if (region == (*ri)) {
-				astate->regions.erase (ri);
-				astate->region_states.erase (rsi);
-			}
-
-			ri = ritmp;
-			rsi = rsitmp;
-		}
-		
-		s = tmp;
-	}
-
 	for (set<Crossfade*>::iterator c = unique_xfades.begin(); c != unique_xfades.end(); ++c) {
 		delete *c;
 	}
@@ -847,8 +677,6 @@ AudioPlaylist::crossfade_changed (Change ignored)
 	   that occured.
 	*/
 
-	maybe_save_state (_("xfade change"));
-
 	notify_modified ();
 }
 
@@ -870,8 +698,6 @@ AudioPlaylist::region_changed (Change what_changed, boost::shared_ptr<Region> re
 
 	parent_wants_notify = Playlist::region_changed (what_changed, region);
 
-	maybe_save_state (_("region modified"));
-
 	if ((parent_wants_notify || (what_changed & our_interests))) {
 		notify_modified ();
 	}