X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_keys.cc;h=0d46665782f8bf74d4861dc3eda786c0e0e39742;hb=0f5bdd666fa66bd279f8629a670d8058780a613d;hp=1bcaafd27957f1a045f801b012698b9498592630;hpb=79986643c0c904f6574bb5323e2233a43a9e622e;p=ardour.git

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index 1bcaafd279..0d46665782 100644
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 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
@@ -15,17 +15,17 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <cstdlib>
 #include <cmath>
 #include <string>
 
-#include <pbd/error.h>
+#include "pbd/error.h"
 
-#include <ardour/session.h>
-#include <ardour/region.h>
+#include "ardour/session.h"
+#include "ardour/region.h"
+#include <gtkmm/treeview.h>
 
 #include "ardour_ui.h"
 #include "editor.h"
@@ -37,19 +37,29 @@
 
 using namespace ARDOUR;
 using namespace PBD;
-using namespace sigc;
 
 void
 Editor::keyboard_selection_finish (bool add)
 {
-	if (session && have_pending_keyboard_selection) {
-		begin_reversible_command (_("keyboard selection"));
+	if (_session && have_pending_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 (pending_keyboard_selection_start, end);
 		}
-		commit_reversible_command ();
+
 		have_pending_keyboard_selection = false;
 	}
 }
@@ -57,71 +67,40 @@ Editor::keyboard_selection_finish (bool add)
 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->regions.empty()) {
-		return;
-	}
-
-	float prefix;
-	bool was_floating;
-
-	if (get_prefix (prefix, was_floating) == 0) {
-		duplicate_some_regions (selection->regions, prefix);
-	} else {
-		duplicate_some_regions (selection->regions, 1);
-	}
-}
+	if (_session) {
+		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
 
-void
-Editor::keyboard_duplicate_selection ()
-{
-	float prefix;
-	bool was_floating;
+			if (mouse_frame (where, ignored)) {
+				pending_keyboard_selection_start = where;
+				have_pending_keyboard_selection = true;
+			}
 
-	if (get_prefix (prefix, was_floating) == 0) {
-		duplicate_selection (prefix);
-	} else {
-		duplicate_selection (1);
+		}
 	}
 }
 
 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)
+Editor::get_prefix (float& /*val*/, bool& was_floating)
 {
-	return Keyboard::the_keyboard().get_prefix (val, was_floating);
+	was_floating = false;
+	return 1;
 }