X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_keyboard.cc;h=cdea9d22720706b33c5f1a710450950a8a8dd058;hb=afa29d319007ce20bd1546c343e9277c58c80c1a;hp=1ffaf2146d906878cf9a5f7287b93d29349f5af6;hpb=503e32b2a689206b6e93200fd1a2eb9a2cc8bbdf;p=ardour.git

diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc
index 1ffaf2146d..cdea9d2272 100644
--- a/gtk2_ardour/editor_keyboard.cc
+++ b/gtk2_ardour/editor_keyboard.cc
@@ -20,9 +20,10 @@
 
 #include <ardour/audioregion.h>
 #include <ardour/playlist.h>
+#include <pbd/memento_command.h>
 
 #include "editor.h"
-#include "regionview.h"
+#include "region_view.h"
 #include "selection.h"
 
 #include "i18n.h"
@@ -78,13 +79,13 @@ Editor::kbd_set_edit_cursor ()
 void
 Editor::kbd_do_split (GdkEvent* ev)
 {
-	jack_nframes_t where = event_frame (ev);
+	nframes_t where = event_frame (ev);
 
 	if (entered_regionview) {
-		if (selection->audio_regions.find (entered_regionview) != selection->audio_regions.end()) {
-			split_regions_at (where, selection->audio_regions);
+		if (selection->regions.find (entered_regionview) != selection->regions.end()) {
+			split_regions_at (where, selection->regions);
 		} else {
-			AudioRegionSelection s;
+			RegionSelection s;
 			s.add (entered_regionview);
 			split_regions_at (where, s);
 		}
@@ -102,11 +103,12 @@ Editor::kbd_mute_unmute_region ()
 {
 	if (entered_regionview) {
 		begin_reversible_command (_("mute region"));
-		session->add_undo (entered_regionview->region.playlist()->get_memento());
+		XMLNode &before = entered_regionview->region()->playlist()->get_state();
 		
-	    entered_regionview->region.set_muted (!entered_regionview->region.muted());
+		entered_regionview->region()->set_muted (!entered_regionview->region()->muted());
 		
-		session->add_redo_no_execute (entered_regionview->region.playlist()->get_memento());
+		XMLNode &after = entered_regionview->region()->playlist()->get_state();
+		session->add_command (new MementoCommand<ARDOUR::Playlist>(*(entered_regionview->region()->playlist()), &before, &after));
 		commit_reversible_command();
 	}
 }
@@ -120,11 +122,11 @@ Editor::kbd_set_sync_position ()
 void
 Editor::kbd_do_set_sync_position (GdkEvent* ev)
 {
-    jack_nframes_t where = event_frame (ev);
+    nframes_t where = event_frame (ev);
 	snap_to (where);
 
 	if (entered_regionview) {
-	  set_a_regions_sync_position (entered_regionview->region, where);
+	  set_a_regions_sync_position (entered_regionview->region(), where);
 	}
 }