light theme needs monitor section style info

[ardour.git] / gtk2_ardour / editor_keyboard.cc

diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc
index ba33e23feaa79d2c968af8fb0d02fa483ff2a50b..e6936232cddcfa9d998dd8a216d335ee55888edc 100644 (file)
--- 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)
@@ -53,10 +55,8 @@ Editor::kbd_driver (sigc::slot<void,GdkEvent*> theslot, bool use_track_canvas, b
        /* any use of "keyboard mouse buttons" invalidates an existing grab
        */
 
-       if (_drag) {
-               _drag->item()->ungrab (GDK_CURRENT_TIME);
-               delete _drag;
-               _drag = 0;
+       if (_drags->active ()) {
+               _drags->abort ();
        }
 
        if (doit) {
@@ -91,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()));
 
                }
 
@@ -104,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();
 
        }