X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_keys.cc;h=acf7d2a14308b95c04dd4659bcbdcbc5f6aa52cb;hb=6b1b72a247bf04c81292fc41af4f69c9b7f90379;hp=1bcaafd27957f1a045f801b012698b9498592630;hpb=79fc27de2ef9db51a8c7c69764b663a9921c5a40;p=ardour.git

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index 1bcaafd279..acf7d2a143 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,113 +15,93 @@
     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 <gtkmm/treeview.h>
 
-#include <ardour/session.h>
-#include <ardour/region.h>
+#include "pbd/error.h"
+
+#include "ardour/session.h"
 
-#include "ardour_ui.h"
 #include "editor.h"
-#include "time_axis_view.h"
 #include "region_view.h"
 #include "selection.h"
+#include "time_axis_view.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
-using namespace sigc;
+using namespace Editing;
 
 void
-Editor::keyboard_selection_finish (bool add)
+Editor::keyboard_selection_finish (bool /*add*/, Editing::EditIgnoreOption ign)
 {
-	if (session && have_pending_keyboard_selection) {
-		begin_reversible_command (_("keyboard selection"));
-		if (add) {
-			selection->add (pending_keyboard_selection_start, session->audible_frame());
+	if (_session) {
+
+		MusicSample start (selection->time.start(), 0);
+		samplepos_t end;
+		if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
+			end = _session->audible_sample();
 		} else {
-			selection->set (0, pending_keyboard_selection_start, session->audible_frame());
+			end = get_preferred_edit_position(ign);
 		}
-		commit_reversible_command ();
-		have_pending_keyboard_selection = false;
-	}
-}
 
-void
-Editor::keyboard_selection_begin ()
-{
-	if (session) {
-		pending_keyboard_selection_start = session->audible_frame();
-		have_pending_keyboard_selection = true;
-	}
-}
+		//if no tracks are selected and we're working from the keyboard, enable all tracks (_something_ has to be selected for any range selection)
+		if ( (_edit_point == EditAtPlayhead) && selection->tracks.empty() )
+			select_all_tracks();
 
-void
-Editor::keyboard_duplicate_region ()
-{
-	if (selection->regions.empty()) {
-		return;
-	}
+		selection->set (start.sample, end);
 
-	float prefix;
-	bool was_floating;
+		//if session is playing a range, cancel that
+		if (_session->get_play_range())
+			_session->request_cancel_play_range();
 
-	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 ()
+Editor::keyboard_selection_begin (Editing::EditIgnoreOption ign)
 {
-	float prefix;
-	bool was_floating;
+	if (_session) {
 
-	if (get_prefix (prefix, was_floating) == 0) {
-		duplicate_selection (prefix);
-	} else {
-		duplicate_selection (1);
-	}
-}
+		MusicSample start (0, 0);
+		MusicSample end (selection->time.end_sample(), 0);
+		if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
+			start.sample = _session->audible_sample();
+		} else {
+			start.sample = get_preferred_edit_position(ign);
+		}
 
-void
-Editor::keyboard_paste ()
-{
-	float prefix;
-	bool was_floating;
+		//if there's not already a sensible selection endpoint, go "forever"
+		if (start.sample > end.sample) {
+#ifdef MIXBUS
+			// 4hours at most.
+			// This works around a visual glitch in red-bordered selection rect.
+			end.sample = start.sample + _session->nominal_sample_rate() * 60 * 60 * 4;
+#else
+			end.sample = max_samplepos;
+#endif
+		}
 
-	if (get_prefix (prefix, was_floating) == 0) {
-		paste (prefix);
-	} else {
-		paste (1);
-	}
-}
+		//if no tracks are selected and we're working from the keyboard, enable all tracks (_something_ has to be selected for any range selection)
+		if ( selection->tracks.empty() )
+			select_all_tracks();
 
-void
-Editor::keyboard_insert_region_list_selection ()
-{
-	float prefix;
-	bool was_floating;
+		selection->set (start.sample, end.sample);
 
-	if (get_prefix (prefix, was_floating) == 0) {
-		insert_region_list_selection (prefix);
-	} else {
-		insert_region_list_selection (1);
+		//if session is playing a range, cancel that
+		if (_session->get_play_range())
+			_session->request_cancel_play_range();
 	}
 }
 
-int
-Editor::get_prefix (float& val, bool& was_floating)
+void
+Editor::keyboard_paste ()
 {
-	return Keyboard::the_keyboard().get_prefix (val, was_floating);
+	paste (1, false);
 }
-