X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_keyboard.cc;h=e6936232cddcfa9d998dd8a216d335ee55888edc;hb=5c144432adbb791ce9d2a2cbd7471da0499b6ea7;hp=257ebc487aee69ec48164f8492d05f7e9ff7ad8d;hpb=d88b950061e09d5ecc67cec6f08e88718e69be1a;p=ardour.git

diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc
index 257ebc487a..e6936232cd 100644
--- a/gtk2_ardour/editor_keyboard.cc
+++ b/gtk2_ardour/editor_keyboard.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2004 Paul Davis 
+    Copyright (C) 2004 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,20 +17,24 @@
 
 */
 
-#include <ardour/audioregion.h>
-#include <ardour/playlist.h>
-#include <ardour/location.h>
+#include "pbd/memento_command.h"
+#include "pbd/stateful_diff_command.h"
 
-#include <pbd/memento_command.h>
+#include "ardour/audioregion.h"
+#include "ardour/playlist.h"
+#include "ardour/session.h"
+#include "ardour/location.h"
 
 #include "editor.h"
 #include "region_view.h"
 #include "selection.h"
 #include "keyboard.h"
+#include "editor_drag.h"
 
 #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)
@@ -50,10 +54,9 @@ 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_info.item) {
-		drag_info.item->ungrab (GDK_CURRENT_TIME);
-		drag_info.item = 0;
+
+	if (_drags->active ()) {
+		_drags->abort ();
 	}
 
 	if (doit) {
@@ -88,27 +91,22 @@ 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()));
 
 		}
 
 		commit_reversible_command ();
 
 	} 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();
-		
+
 	}
 }
 
@@ -121,6 +119,6 @@ Editor::kbd_do_brush (GdkEvent *ev)
 void
 Editor::kbd_brush ()
 {
-	kbd_driver (mem_fun(*this, &Editor::kbd_do_brush), true, true, false);
+	kbd_driver (sigc::mem_fun(*this, &Editor::kbd_do_brush), true, true, false);
 }