X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_keys.cc;h=2c64d6f4f39da193d8fdaebdcbfc371d083a3432;hb=ae0dcdc0c5d13483271065c360e378202d20170a;hp=93eba4b79f02c24b714b52de0212bd4247acba90;hpb=e5024657fc5970691c7d8f89c49a7bb9895e1b04;p=ardour.git

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index 93eba4b79f..2c64d6f4f3 100644
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -27,65 +27,87 @@
 
 #include "ardour/session.h"
 
-#include "ardour_ui.h"
 #include "editor.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 Editing;
 
 void
-Editor::keyboard_selection_finish (bool add)
+Editor::keyboard_selection_finish (bool /*add*/, Editing::EditIgnoreOption ign)
 {
-	if (_session && have_pending_keyboard_selection) {
+	if (_session) {
 
+		MusicFrame start (selection->time.start(), 0);
 		framepos_t end;
-		bool ignored;
-
-		if (_session->transport_rolling()) {
+		if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
 			end = _session->audible_frame();
 		} else {
-			if (!mouse_frame (end, ignored)) {
-				return;
-			}
+			end = get_preferred_edit_position(ign);
 		}
 
-		if (add) {
-			selection->add (pending_keyboard_selection_start, end);
-		} else {
-			selection->set (pending_keyboard_selection_start, end);
-		}
+		//snap the selection start/end
+		snap_to (start);
+
+		//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();
+
+		selection->set (start.frame, end);
+
+		//if session is playing a range, cancel that
+		if (_session->get_play_range())
+			_session->request_cancel_play_range();
 
-		have_pending_keyboard_selection = false;
 	}
 }
 
 void
-Editor::keyboard_selection_begin ()
+Editor::keyboard_selection_begin (Editing::EditIgnoreOption ign)
 {
 	if (_session) {
-		if (_session->transport_rolling()) {
-			pending_keyboard_selection_start = _session->audible_frame();
-			have_pending_keyboard_selection = true;
-		} else {
-			bool ignored;
-			framepos_t where; // XXX fix me
 
-			if (mouse_frame (where, ignored)) {
-				pending_keyboard_selection_start = where;
-				have_pending_keyboard_selection = true;
-			}
+		MusicFrame start (0, 0);
+		MusicFrame end (selection->time.end_frame(), 0);
+		if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
+			start.frame = _session->audible_frame();
+		} else {
+			start.frame = get_preferred_edit_position(ign);
+		}
 
+		//snap the selection start/end
+		snap_to(start);
+
+		//if there's not already a sensible selection endpoint, go "forever"
+		if (start.frame > end.frame) {
+#ifdef MIXBUS
+			// 4hours at most.
+			// This works around a visual glitch in red-bordered selection rect.
+			end.frame = start.frame + _session->nominal_frame_rate() * 60 * 60 * 4;
+#else
+			end.frame = max_framepos;
+#endif
 		}
+
+		//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();
+
+		selection->set (start.frame, end.frame);
+
+		//if session is playing a range, cancel that
+		if (_session->get_play_range())
+			_session->request_cancel_play_range();
 	}
 }
 
 void
 Editor::keyboard_paste ()
 {
-	paste (1);
+	paste (1, false);
 }