X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_keys.cc;h=efbe0cb522be71fa182e336d477bed3b2eb4b4ed;hb=e55e3fde7cec89c49e01046a2db276b2d8f30958;hp=baa158cbf8374c6e73ceda214b1227ccbbcda0db;hpb=7ff370e79895d7eb293e7214689b791bd98415fb;p=ardour.git

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index baa158cbf8..efbe0cb522 100644
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdlib>
@@ -26,11 +25,12 @@
 
 #include <ardour/session.h>
 #include <ardour/region.h>
+#include <gtkmm/treeview.h>
 
 #include "ardour_ui.h"
 #include "editor.h"
 #include "time_axis_view.h"
-#include "regionview.h"
+#include "region_view.h"
 #include "selection.h"
 
 #include "i18n.h"
@@ -43,13 +43,24 @@ void
 Editor::keyboard_selection_finish (bool add)
 {
 	if (session && have_pending_keyboard_selection) {
-		begin_reversible_command (_("keyboard selection"));
+
+		nframes64_t end;
+		bool ignored;
+
+		if (session->transport_rolling()) {
+			end = session->audible_frame();
+		} else {
+			if (!mouse_frame (end, ignored)) {
+				return;
+			}
+		}
+
 		if (add) {
-			selection->add (pending_keyboard_selection_start, session->audible_frame());
+			selection->add (pending_keyboard_selection_start, end);
 		} else {
-			selection->set (0, pending_keyboard_selection_start, session->audible_frame());
+			selection->set (0, pending_keyboard_selection_start, end);
 		}
-		commit_reversible_command ();
+
 		have_pending_keyboard_selection = false;
 	}
 }
@@ -58,70 +69,39 @@ void
 Editor::keyboard_selection_begin ()
 {
 	if (session) {
-		pending_keyboard_selection_start = session->audible_frame();
-		have_pending_keyboard_selection = true;
-	}
-}
-
-void
-Editor::keyboard_duplicate_region ()
-{
-	if (selection->audio_regions.empty()) {
-		return;
-	}
-
-	float prefix;
-	bool was_floating;
-
-	if (get_prefix (prefix, was_floating) == 0) {
-		duplicate_some_regions (selection->audio_regions, prefix);
-	} else {
-		duplicate_some_regions (selection->audio_regions, 1);
-	}
-}
-
-void
-Editor::keyboard_duplicate_selection ()
-{
-	float prefix;
-	bool was_floating;
-
-	if (get_prefix (prefix, was_floating) == 0) {
-		duplicate_selection (prefix);
-	} else {
-		duplicate_selection (1);
+		if (session->transport_rolling()) {
+			pending_keyboard_selection_start = session->audible_frame();
+			have_pending_keyboard_selection = true;
+		} else {
+			bool ignored;
+			nframes64_t where; // XXX fix me
+
+			if (mouse_frame (where, ignored)) {
+				pending_keyboard_selection_start = where;
+				have_pending_keyboard_selection = true;
+			}
+				
+		}
 	}
 }
 
 void
 Editor::keyboard_paste ()
 {
-	float prefix;
-	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;
-	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
 Editor::get_prefix (float& val, bool& was_floating)
 {
-	return Keyboard::the_keyboard().get_prefix (val, was_floating);
+	was_floating = false;
+	return 1;
 }