X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_keys.cc;h=fba52014bce43fe844ea9643c278f34c8e5bd90e;hb=aebd22cbe60818b5413e0cadef6b9bf8dc17ecac;hp=2548a68ab41c6309ce47ec259d484160b49a8544;hpb=38bae2996a1a89622fb23817082d78ad213327fb;p=ardour.git

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index 2548a68ab4..fba52014bc 100644
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -32,29 +32,29 @@
 #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) {
 
 		framepos_t start = selection->time.start();
 		framepos_t end;
-		
+
 		if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
 			end = _session->audible_frame();
 		} else {
-			end = get_preferred_edit_position();
+			end = get_preferred_edit_position(ign);
 		}
 
 		//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();
@@ -69,31 +69,37 @@ Editor::keyboard_selection_finish (bool /*add*/)
 }
 
 void
-Editor::keyboard_selection_begin ()
+Editor::keyboard_selection_begin (Editing::EditIgnoreOption ign)
 {
 	if (_session) {
 
 		framepos_t start;
-		framepos_t end = selection->time.end_frame();  //0 if no current selection
+		framepos_t end = selection->time.end_frame();
 
 		if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
 			start = _session->audible_frame();
 		} else {
-			start = get_preferred_edit_position();
+			start = 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 > end ) {
+		if (start > end) {
+#ifdef MIXBUS
+			// 4hours at most.
+			// This works around a visual glitch in red-bordered selection rect.
+			end = start + _session->nominal_frame_rate() * 60 * 60 * 4;
+#else
 			end = 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, end);
 
 		//if session is playing a range, cancel that
@@ -105,5 +111,5 @@ Editor::keyboard_selection_begin ()
 void
 Editor::keyboard_paste ()
 {
-	paste (1);
+	paste (1, false);
 }