X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_keyboard.cc;h=e9082445c441b40e1bf69d4d2da2ba82b4cb0635;hb=4e4cb140a0713cabec624f13e86eaf9b375ab6c5;hp=df9bbf00bad5df5ce118859f6b8c57d1d15574bc;hpb=b7bffbe7a249356a93d25a41f7c472cc9dd8f27f;p=ardour.git

diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc
index df9bbf00ba..e9082445c4 100644
--- a/gtk2_ardour/editor_keyboard.cc
+++ b/gtk2_ardour/editor_keyboard.cc
@@ -15,14 +15,14 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #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 +78,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.contains (entered_regionview)) {
+			split_regions_at (where, selection->regions);
 		} else {
-			AudioRegionSelection s;
+			RegionSelection s;
 			s.add (entered_regionview);
 			split_regions_at (where, s);
 		}
@@ -102,12 +102,12 @@ Editor::kbd_mute_unmute_region ()
 {
 	if (entered_regionview) {
 		begin_reversible_command (_("mute region"));
-		XMLNode &before = entered_regionview->region.playlist()->get_state();
+		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());
 		
-		XMLNode &after = entered_regionview->region.playlist()->get_state();
-		session->add_command (MementoCommand<Playlist>(entered_regionview->region.playlist(), before, after));
+		XMLNode &after = entered_regionview->region()->playlist()->get_state();
+		session->add_command (new MementoCommand<ARDOUR::Playlist>(*(entered_regionview->region()->playlist()), &before, &after));
 		commit_reversible_command();
 	}
 }
@@ -121,11 +121,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);
 	}
 }