diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-02 18:05:26 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-02 18:05:26 +0000 |
| commit | 17088ee3ea5af1e6174b098bb5bcfdaec6ebf9b0 (patch) | |
| tree | cbf9fe8fb94212f9a50c6b760ebaac3b4a1bcec6 /gtk2_ardour/editor_keyboard.cc | |
| parent | a5ab2e99e19d5f5d4c1f91f38cd774fefdf257dc (diff) | |
(1) remove most uses of MementoCommand for Playlist and Region (2) move frozen state from Region into Stateful, renamed "suspend property changes" (3) successive changes to a Property (scalar) after clear_history() do not keep resetting the old value (fixes region trim)
git-svn-id: svn://localhost/ardour2/branches/3.0@6720 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_keyboard.cc')
| -rw-r--r-- | gtk2_ardour/editor_keyboard.cc | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc index ea40b43f50..e6936232cd 100644 --- a/gtk2_ardour/editor_keyboard.cc +++ b/gtk2_ardour/editor_keyboard.cc @@ -17,13 +17,14 @@ */ +#include "pbd/memento_command.h" +#include "pbd/stateful_diff_command.h" + #include "ardour/audioregion.h" #include "ardour/playlist.h" #include "ardour/session.h" #include "ardour/location.h" -#include "pbd/memento_command.h" - #include "editor.h" #include "region_view.h" #include "selection.h" @@ -33,6 +34,7 @@ #include "i18n.h" using namespace ARDOUR; +using namespace PBD; void Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot, bool use_track_canvas, bool use_time_canvas, bool can_select) @@ -89,11 +91,9 @@ Editor::kbd_mute_unmute_region () for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { - XMLNode &before = (*i)->region()->playlist()->get_state (); + (*i)->region()->playlist()->clear_history (); (*i)->region()->set_muted (!(*i)->region()->muted ()); - XMLNode &after = (*i)->region()->playlist()->get_state (); - - _session->add_command (new MementoCommand<ARDOUR::Playlist>(*((*i)->region()->playlist()), &before, &after)); + _session->add_command (new StatefulDiffCommand ((*i)->region()->playlist())); } @@ -102,12 +102,9 @@ Editor::kbd_mute_unmute_region () } else if (entered_regionview) { begin_reversible_command (_("mute region")); - XMLNode &before = entered_regionview->region()->playlist()->get_state(); - + entered_regionview->region()->playlist()->clear_history (); entered_regionview->region()->set_muted (!entered_regionview->region()->muted()); - - XMLNode &after = entered_regionview->region()->playlist()->get_state(); - _session->add_command (new MementoCommand<ARDOUR::Playlist>(*(entered_regionview->region()->playlist()), &before, &after)); + _session->add_command (new StatefulDiffCommand (entered_regionview->region()->playlist())); commit_reversible_command(); } |