Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.

git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 4 insertions, 48 deletions

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index d06b9f85aa..efbe0cb522 100644
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -25,6 +25,7 @@
 
 #include <ardour/session.h>
 #include <ardour/region.h>
+#include <gtkmm/treeview.h>
 
 #include "ardour_ui.h"
 #include "editor.h"
@@ -41,8 +42,6 @@ using namespace sigc;
 void
 Editor::keyboard_selection_finish (bool add)
 {
-	cerr << "here\n";
-
 	if (session && have_pending_keyboard_selection) {
 
 		nframes64_t end;
@@ -87,59 +86,16 @@ Editor::keyboard_selection_begin ()
 }
 
 void
-Editor::keyboard_duplicate_region ()
-{
-	if (selection->regions.empty()) {
-		return;
-	}
-
-	float prefix = 0;
-	bool was_floating;
-
-	if (get_prefix (prefix, was_floating) == 0) {
-		duplicate_some_regions (selection->regions, prefix);
-	} else {
-		duplicate_some_regions (selection->regions, 1);
-	}
-}
-
-void
-Editor::keyboard_duplicate_selection ()
-{
-	float prefix = 0;
-	bool was_floating;
-
-	if (get_prefix (prefix, was_floating) == 0) {
-		duplicate_selection (prefix);
-	} else {
-		duplicate_selection (1);
-	}
-}
-
-void
 Editor::keyboard_paste ()
 {
-	float prefix = 0;
-	bool was_floating;
-
-	if (get_prefix (prefix, was_floating) == 0) {
-		paste (prefix);
-	} else {
-		paste (1);
-	}
+	ensure_entered_track_selected (true);
+	paste (1);
 }
 
 void
 Editor::keyboard_insert_region_list_selection ()
 {
-	float prefix = 0;
-	bool was_floating;
-
-	if (get_prefix (prefix, was_floating) == 0) {
-		insert_region_list_selection (prefix);
-	} else {
-		insert_region_list_selection (1);
-	}
+	insert_region_list_selection (1);
 }
 
 int