r316@gandalf: fugalh | 2006-08-11 17:06:48 -0600

 Reconstitution. Comiples, untested.


git-svn-id: svn://localhost/ardour2/branches/undo@797 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 38 insertions, 38 deletions

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 1e5f336e52..55a863c6e3 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -213,7 +213,7 @@ Editor::split_regions_at (jack_nframes_t where, RegionSelection& regions)
                         XMLNode &before = pl->get_state();
 			pl->split_region ((*a)->region(), where);
                         XMLNode &after = pl->get_state();
-                        session->add_command(new MementoCommand<Playlist>(*pl, before, after));
+                        session->add_command(new MementoCommand<Playlist>(*pl, &before, &after));
 		}
 
 		a = tmp;
@@ -236,7 +236,7 @@ Editor::remove_clicked_region ()
         XMLNode &before = playlist->get_state();
 	playlist->remove_region (&clicked_regionview->region());
         XMLNode &after = playlist->get_state();
-	session->add_command(new MementoCommand<Playlist>(*playlist, before, after));
+	session->add_command(new MementoCommand<Playlist>(*playlist, &before, &after));
 	commit_reversible_command ();
 }
 
@@ -412,7 +412,7 @@ Editor::nudge_forward (bool next)
                         XMLNode &before = r.playlist()->get_state();
 			r.set_position (r.position() + distance, this);
                         XMLNode &after = r.playlist()->get_state();
-			session->add_command (new MementoCommand<Playlist>(*(r.playlist()), before, after));
+			session->add_command (new MementoCommand<Playlist>(*(r.playlist()), &before, &after));
 		}
 
 		commit_reversible_command ();
@@ -452,7 +452,7 @@ Editor::nudge_backward (bool next)
 				r.set_position (0, this);
 			}
                         XMLNode &after = r.playlist()->get_state();
-			session->add_command(new MementoCommand<Playlist>(*(r.playlist()), before, after));
+			session->add_command(new MementoCommand<Playlist>(*(r.playlist()), &before, &after));
 		}
 
 		commit_reversible_command ();
@@ -488,7 +488,7 @@ Editor::nudge_forward_capture_offset ()
 			XMLNode &before = r.playlist()->get_state();
 			r.set_position (r.position() + distance, this);
 			XMLNode &after = r.playlist()->get_state();
-			session->add_command(new MementoCommand<Playlist>(*(r.playlist()), before, after));
+			session->add_command(new MementoCommand<Playlist>(*(r.playlist()), &before, &after));
 		}
 
 		commit_reversible_command ();
@@ -520,7 +520,7 @@ Editor::nudge_backward_capture_offset ()
 				r.set_position (0, this);
 			}
                         XMLNode &after = r.playlist()->get_state();
-			session->add_command(new MementoCommand<Playlist>(*(r.playlist()), before, after));
+			session->add_command(new MementoCommand<Playlist>(*(r.playlist()), &before, &after));
 		}
 
 		commit_reversible_command ();
@@ -1300,7 +1300,7 @@ Editor::add_location_from_selection ()
         XMLNode &before = session->locations()->get_state();
 	session->locations()->add (location, true);
         XMLNode &after = session->locations()->get_state();
-	session->add_command(new MementoCommand<Locations>(*(session->locations()), before, after));
+	session->add_command(new MementoCommand<Locations>(*(session->locations()), &before, &after));
 	session->commit_reversible_command ();
 }
 
@@ -1314,7 +1314,7 @@ Editor::add_location_from_playhead_cursor ()
         XMLNode &before = session->locations()->get_state();
 	session->locations()->add (location, true);
         XMLNode &after = session->locations()->get_state();
-	session->add_command(new MementoCommand<Locations>(*(session->locations()), before, after));
+	session->add_command(new MementoCommand<Locations>(*(session->locations()), &before, &after));
 	session->commit_reversible_command ();
 }
 
@@ -1333,7 +1333,7 @@ Editor::add_location_from_audio_region ()
         XMLNode &before = session->locations()->get_state();
 	session->locations()->add (location, true);
         XMLNode &after = session->locations()->get_state();
-	session->add_command(new MementoCommand<Locations>(*(session->locations()), before, after));
+	session->add_command(new MementoCommand<Locations>(*(session->locations()), &before, &after));
 	session->commit_reversible_command ();
 }
 
@@ -1752,7 +1752,7 @@ Editor::clear_markers ()
                 XMLNode &before = session->locations()->get_state();
 		session->locations()->clear_markers ();
                 XMLNode &after = session->locations()->get_state();
-		session->add_command(new MementoCommand<Locations>(*(session->locations()), before, after));
+		session->add_command(new MementoCommand<Locations>(*(session->locations()), &before, &after));
 		session->commit_reversible_command ();
 	}
 }
@@ -1773,7 +1773,7 @@ Editor::clear_ranges ()
 		if (punchloc) session->locations()->add (punchloc);
 		
                 XMLNode &after = session->locations()->get_state();
-		session->add_command(new MementoCommand<Locations>(*(session->locations()), before, after));
+		session->add_command(new MementoCommand<Locations>(*(session->locations()), &before, &after));
 		session->commit_reversible_command ();
 	}
 }
@@ -1785,7 +1785,7 @@ Editor::clear_locations ()
         XMLNode &before = session->locations()->get_state();
 	session->locations()->clear ();
         XMLNode &after = session->locations()->get_state();
-	session->add_command(new MementoCommand<Locations>(*(session->locations()), before, after));
+	session->add_command(new MementoCommand<Locations>(*(session->locations()), &before, &after));
 	session->commit_reversible_command ();
 	session->locations()->clear ();
 }
@@ -1835,7 +1835,7 @@ Editor::insert_region_list_drag (AudioRegion& region, int x, int y)
 	begin_reversible_command (_("insert dragged region"));
         XMLNode &before = playlist->get_state();
 	playlist->add_region (*(new AudioRegion (region)), where, 1.0);
-	session->add_command(new MementoCommand<Playlist>(*playlist, before, playlist->get_state()));
+	session->add_command(new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
 	commit_reversible_command ();
 }
 
@@ -1871,7 +1871,7 @@ Editor::insert_region_list_selection (float times)
 	begin_reversible_command (_("insert region"));
         XMLNode &before = playlist->get_state();
 	playlist->add_region (*(createRegion (*region)), edit_cursor->current_frame, times);
-	session->add_command(new MementoCommand<Playlist>(*playlist, before, playlist->get_state()));
+	session->add_command(new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
 	commit_reversible_command ();
 }
 
@@ -2308,7 +2308,7 @@ Editor::separate_region_from_selection ()
 					}
 
 					if (doing_undo) 
-                                            session->add_command(new MementoCommand<Playlist>(*playlist, *before, playlist->get_state()));
+                                            session->add_command(new MementoCommand<Playlist>(*playlist, before, &playlist->get_state()));
 				}
 			}
 		}
@@ -2359,7 +2359,7 @@ Editor::separate_regions_using_location (Location& loc)
 
 					playlist->partition ((jack_nframes_t)(loc.start() * speed), (jack_nframes_t)(loc.end() * speed), true);
 					if (doing_undo) 
-                                            session->add_command(new MementoCommand<Playlist>(*playlist, *before, playlist->get_state()));
+                                            session->add_command(new MementoCommand<Playlist>(*playlist, before, &playlist->get_state()));
 				}
 			}
 		}
@@ -2433,7 +2433,7 @@ Editor::crop_region_to_selection ()
                         XMLNode &before = (*i)->get_state();
 			region->trim_to (start, cnt, this);
                         XMLNode &after = (*i)->get_state();
-			session->add_command (new MementoCommand<Playlist>(*(*i), before, after));
+			session->add_command (new MementoCommand<Playlist>(*(*i), &before, &after));
 		}
 
 		commit_reversible_command ();
@@ -2476,7 +2476,7 @@ Editor::region_fill_track ()
 
                 XMLNode &before = pl->get_state();
 		pl->add_region (*(new AudioRegion (*ar)), ar->last_frame(), times);
-		session->add_command (new MementoCommand<Playlist>(*pl, before, pl->get_state()));
+		session->add_command (new MementoCommand<Playlist>(*pl, &before, &pl->get_state()));
 	}
 
 	commit_reversible_command ();
@@ -2526,7 +2526,7 @@ Editor::region_fill_selection ()
 		
                 XMLNode &before = playlist->get_state();
 		playlist->add_region (*(createRegion (*region)), start, times);
-		session->add_command (new MementoCommand<Playlist>(*playlist, before, playlist->get_state()));
+		session->add_command (new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
 	}
 	
 	commit_reversible_command ();			
@@ -2544,7 +2544,7 @@ Editor::set_a_regions_sync_position (Region& region, jack_nframes_t position)
         XMLNode &before = region.playlist()->get_state();
 	region.set_sync_position (position);
         XMLNode &after = region.playlist()->get_state();
-	session->add_command(new MementoCommand<Playlist>(*(region.playlist()), before, after));
+	session->add_command(new MementoCommand<Playlist>(*(region.playlist()), &before, &after));
 	commit_reversible_command ();
 }
 
@@ -2565,7 +2565,7 @@ Editor::set_region_sync_from_edit_cursor ()
         XMLNode &before = region.playlist()->get_state();
 	region.set_sync_position (edit_cursor->current_frame);
         XMLNode &after = region.playlist()->get_state();
-	session->add_command(new MementoCommand<Playlist>(*(region.playlist()), before, after));
+	session->add_command(new MementoCommand<Playlist>(*(region.playlist()), &before, &after));
 	commit_reversible_command ();
 }
 
@@ -2578,7 +2578,7 @@ Editor::remove_region_sync ()
                 XMLNode &before = region.playlist()->get_state();
 		region.clear_sync_position ();
                 XMLNode &after = region.playlist()->get_state();
-		session->add_command(new MementoCommand<Playlist>(*(region.playlist()), before, after));
+		session->add_command(new MementoCommand<Playlist>(*(region.playlist()), &before, &after));
 		commit_reversible_command ();
 	}
 }
@@ -2594,7 +2594,7 @@ Editor::naturalize ()
                 XMLNode &before = (*i)->region().get_state();
 		(*i)->region().move_to_natural_position (this);
                 XMLNode &after = (*i)->region().get_state();
-		session->add_command (new MementoCommand<Region>((*i)->region(), before, after));
+		session->add_command (new MementoCommand<Region>((*i)->region(), &before, &after));
 	}
 	commit_reversible_command ();
 }
@@ -2669,7 +2669,7 @@ Editor::align_selection_relative (RegionPoint point, jack_nframes_t position)
 		}
 
                 XMLNode &after = region.playlist()->get_state();
-		session->add_command(new MementoCommand<Playlist>(*(region.playlist()), before, after));
+		session->add_command(new MementoCommand<Playlist>(*(region.playlist()), &before, &after));
 
 	}
 
@@ -2722,7 +2722,7 @@ Editor::align_region_internal (Region& region, RegionPoint point, jack_nframes_t
 	}
 
 	XMLNode &after = region.playlist()->get_state();
-	session->add_command(new MementoCommand<Playlist>(*(region.playlist()), before, after));
+	session->add_command(new MementoCommand<Playlist>(*(region.playlist()), &before, &after));
 }	
 
 void
@@ -2747,7 +2747,7 @@ Editor::trim_region_to_edit_cursor ()
         XMLNode &before = region.playlist()->get_state();
 	region.trim_end( session_frame_to_track_frame(edit_cursor->current_frame, speed), this);
         XMLNode &after = region.playlist()->get_state();
-	session->add_command(new MementoCommand<Playlist>(*(region.playlist()), before, after));
+	session->add_command(new MementoCommand<Playlist>(*(region.playlist()), &before, &after));
 	commit_reversible_command ();
 }
 
@@ -2773,7 +2773,7 @@ Editor::trim_region_from_edit_cursor ()
         XMLNode &before = region.playlist()->get_state();
 	region.trim_front ( session_frame_to_track_frame(edit_cursor->current_frame, speed), this);
         XMLNode &after = region.playlist()->get_state();
-	session->add_command(new MementoCommand<Playlist>(*(region.playlist()), before, after));
+	session->add_command(new MementoCommand<Playlist>(*(region.playlist()), &before, &after));
 	commit_reversible_command ();
 }
 
@@ -2888,7 +2888,7 @@ Editor::bounce_range_selection ()
                 XMLNode &before = playlist->get_state();
 		atv->audio_track()->bounce_range (start, cnt, itt);
                 XMLNode &after = playlist->get_state();
-		session->add_command (new MementoCommand<Playlist> (*playlist, before, after));
+		session->add_command (new MementoCommand<Playlist> (*playlist, &before, &after));
 	}
 	
 	commit_reversible_command ();
@@ -3006,7 +3006,7 @@ Editor::cut_copy_regions (CutCopyOp op)
 				insert_result = freezelist.insert (pl);
 				if (insert_result.second) {
 					pl->freeze ();
-                                        session->add_command (new MementoUndoCommand<Playlist>(*pl, pl->get_state()));
+                                        session->add_command (new MementoCommand<Playlist>(*pl, &pl->get_state(), 0));
 				}
 			}
 		}
@@ -3070,7 +3070,7 @@ Editor::cut_copy_regions (CutCopyOp op)
 	
 	for (set<Playlist*>::iterator pl = freezelist.begin(); pl != freezelist.end(); ++pl) {
 		(*pl)->thaw ();
-		session->add_command (new MementoRedoCommand<Playlist>(*(*pl), (*pl)->get_state()));
+		session->add_command (new MementoCommand<Playlist>(*(*pl), 0, &(*pl)->get_state()));
 	}
 }
 
@@ -3185,7 +3185,7 @@ Editor::paste_named_selection (float times)
 
                 XMLNode &before = apl->get_state();
 		apl->paste (**chunk, edit_cursor->current_frame, times);
-		session->add_command(new MementoCommand<AudioPlaylist>(*apl, before, apl->get_state()));
+		session->add_command(new MementoCommand<AudioPlaylist>(*apl, &before, &apl->get_state()));
 
 		if (tmp != ns->playlists.end()) {
 			chunk = tmp;
@@ -3216,7 +3216,7 @@ Editor::duplicate_some_regions (RegionSelection& regions, float times)
  		playlist = (*i)->region().playlist();
                 XMLNode &before = playlist->get_state();
 		playlist->duplicate (r, r.last_frame(), times);
-		session->add_command(new MementoCommand<Playlist>(*playlist, before, playlist->get_state()));
+		session->add_command(new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
 
 		c.disconnect ();
 
@@ -3257,7 +3257,7 @@ Editor::duplicate_selection (float times)
                 XMLNode &before = playlist->get_state();
 		playlist->duplicate (**ri, selection->time[clicked_selection].end, times);
                 XMLNode &after = playlist->get_state();
-		session->add_command (new MementoCommand<Playlist>(*playlist, before, after));
+		session->add_command (new MementoCommand<Playlist>(*playlist, &before, &after));
 
 		++ri;
 		if (ri == new_regions.end()) {
@@ -3308,7 +3308,7 @@ Editor::clear_playlist (Playlist& playlist)
         XMLNode &before = playlist.get_state();
 	playlist.clear ();
         XMLNode &after = playlist.get_state();
-	session->add_command (new MementoCommand<Playlist>(playlist, before, after));
+	session->add_command (new MementoCommand<Playlist>(playlist, &before, &after));
 	commit_reversible_command ();
 }
 
@@ -3345,7 +3345,7 @@ Editor::nudge_track (bool use_edit_cursor, bool forwards)
                 XMLNode &before = playlist->get_state();
 		playlist->nudge_after (start, distance, forwards);
                 XMLNode &after = playlist->get_state();
-		session->add_command (new MementoCommand<Playlist>(*playlist, before, after));
+		session->add_command (new MementoCommand<Playlist>(*playlist, &before, &after));
 	}
 	
 	commit_reversible_command ();			
@@ -3401,7 +3401,7 @@ Editor::normalize_region ()
 			continue;
  		XMLNode &before = arv->region().get_state();
 		arv->audio_region().normalize_to (0.0f);
-		session->add_command (new MementoCommand<Region>(arv->region(), before, arv->region().get_state()));
+		session->add_command (new MementoCommand<Region>(arv->region(), &before, &arv->region().get_state()));
 	}
 
 	commit_reversible_command ();
@@ -3428,7 +3428,7 @@ Editor::denormalize_region ()
 			continue;
 		XMLNode &before = arv->region().get_state();
 		arv->audio_region().set_scale_amplitude (1.0f);
-		session->add_command (new MementoCommand<Region>(arv->region(), before, arv->region().get_state()));
+		session->add_command (new MementoCommand<Region>(arv->region(), &before, &arv->region().get_state()));
 	}
 
 	commit_reversible_command ();
@@ -3475,7 +3475,7 @@ Editor::apply_filter (AudioFilter& filter, string command)
                         XMLNode &before = playlist->get_state();
 			playlist->replace_region (arv->region(), *(filter.results.front()), arv->region().position());
                         XMLNode &after = playlist->get_state();
-			session->add_command(new MementoCommand<Playlist>(*playlist, before, after));
+			session->add_command(new MementoCommand<Playlist>(*playlist, &before, &after));
 		} else {
 			goto out;
 		}