smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 00:34:59 +01:00
Code Issues Projects Releases Wiki Activity

goodbye to MementoCommand for playlists

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6726 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-03-04 13:15:04 +00:00
parent c2c224727e
commit 6dde6c5a8f
8 changed files with 108 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

29
gtk2_ardour/route_time_axis.cc
View file

@ -33,7 +33,7 @@
#include "pbd/whitespace.h"
#include "pbd/memento_command.h"
#include "pbd/enumwriter.h"
#include "pbd/stacktrace.h"
#include "pbd/stateful_diff_command.h"
#include <gtkmm/menu.h>
#include <gtkmm/menuitem.h>
@ -1385,12 +1385,22 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
}
}
XMLNode &before = playlist->get_state();
playlist->clear_history ();
playlist->clear_owned_history ();
switch (op) {
case Cut:
if ((what_we_got = playlist->cut (time)) != 0) {
_editor.get_cut_buffer().add (what_we_got);
_session->add_command( new MementoCommand<Playlist>(*playlist.get(), &before, &playlist->get_state()));
vector<StatefulDiffCommand*> cmds;
playlist->rdiff (cmds);
for (vector<StatefulDiffCommand*>::iterator c = cmds.begin(); c != cmds.end(); ++c) {
_session->add_command (*c);
}
_session->add_command (new StatefulDiffCommand (playlist));
ret = true;
}
break;
@ -1402,7 +1412,14 @@ RouteTimeAxisView::cut_copy_clear (Selection& selection, CutCopyOp op)
case Clear:
if ((what_we_got = playlist->cut (time)) != 0) {
_session->add_command( new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
vector<StatefulDiffCommand*> cmds;
playlist->rdiff (cmds);
for (vector<StatefulDiffCommand*>::iterator c = cmds.begin(); c != cmds.end(); ++c) {
_session->add_command (*c);
}
_session->add_command (new StatefulDiffCommand (playlist));
what_we_got->release ();
ret = true;
}
@ -1432,9 +1449,9 @@ RouteTimeAxisView::paste (nframes_t pos, float times, Selection& selection, size
pos = session_frame_to_track_frame(pos, get_diskstream()->speed() );
}
XMLNode &before = playlist->get_state();
playlist->clear_history ();
playlist->paste (*p, pos, times);
_session->add_command( new MementoCommand<Playlist>(*playlist, &before, &playlist->get_state()));
_session->add_command (new StatefulDiffCommand (playlist));
return true;
}