diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-19 22:02:30 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-19 22:02:30 +0000 |
commit | 2592a320d42dd4a157ee16101c042d875d3142be (patch) | |
tree | 0409a06f1ef030dc9339c5c17bd3ff1854125256 /gtk2_ardour/editor_ops.cc | |
parent | 0c31e4c4f3d0bfe37d26a793c934f1b436f8fa0f (diff) |
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
Diffstat (limited to 'gtk2_ardour/editor_ops.cc')
-rw-r--r-- | gtk2_ardour/editor_ops.cc | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 0a3104d36a..280804c94f 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -2910,14 +2910,26 @@ Editor::cut_copy_points (CutCopyOp op) } } +struct PlaylistState { + Playlist* playlist; + XMLNode* before; +}; + +struct lt_playlist { + bool operator () (const PlaylistState& a, const PlaylistState& b) { + return a.playlist < b.playlist; + } +}; + void Editor::cut_copy_regions (CutCopyOp op) { typedef std::map<AudioPlaylist*,AudioPlaylist*> PlaylistMapping; PlaylistMapping pmap; nframes_t first_position = max_frames; - set<Playlist*> freezelist; - pair<set<Playlist*>::iterator,bool> insert_result; + + set<PlaylistState, lt_playlist> freezelist; + pair<set<PlaylistState, lt_playlist>::iterator,bool> insert_result; for (RegionSelection::iterator x = selection->regions.begin(); x != selection->regions.end(); ++x) { first_position = min ((*x)->region()->position(), first_position); @@ -2925,10 +2937,15 @@ Editor::cut_copy_regions (CutCopyOp op) if (op == Cut || op == Clear) { AudioPlaylist *pl = dynamic_cast<AudioPlaylist*>((*x)->region()->playlist()); if (pl) { - insert_result = freezelist.insert (pl); + + PlaylistState before; + before.playlist = pl; + before.before = &pl->get_state(); + + insert_result = freezelist.insert (before); + if (insert_result.second) { pl->freeze (); - session->add_command (new MementoCommand<Playlist>(*pl, &pl->get_state(), 0)); } } } @@ -2990,9 +3007,9 @@ Editor::cut_copy_regions (CutCopyOp op) cut_buffer->set (foo); } - for (set<Playlist*>::iterator pl = freezelist.begin(); pl != freezelist.end(); ++pl) { - (*pl)->thaw (); - session->add_command (new MementoCommand<Playlist>(*(*pl), 0, &(*pl)->get_state())); + for (set<PlaylistState, lt_playlist>::iterator pl = freezelist.begin(); pl != freezelist.end(); ++pl) { + (*pl).playlist->thaw (); + session->add_command (new MementoCommand<Playlist>(*(*pl).playlist, (*pl).before, &(*pl).playlist->get_state())); } } |