X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_keys.cc;h=2c64d6f4f39da193d8fdaebdcbfc371d083a3432;hb=1955ff3ad2315fb6377140d45a133d041c1c9dc1;hp=34847bbfe4c3fd8332e03e853b9490c49ac82588;hpb=a1c8e67e50d0bb61e7389ccd81ea80f50ec3388a;p=ardour.git

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index 34847bbfe4..2c64d6f4f3 100644
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -27,40 +27,38 @@
 
 #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) {
 
-		framepos_t start = selection->time.start();
+		MusicFrame start (selection->time.start(), 0);
 		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);
-		
+		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, end);
+		selection->set (start.frame, end);
 
 		//if session is playing a range, cancel that
 		if (_session->get_play_range())
@@ -70,32 +68,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
-
+		MusicFrame start (0, 0);
+		MusicFrame end (selection->time.end_frame(), 0);
 		if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
-			start = _session->audible_frame();
+			start.frame = _session->audible_frame();
 		} else {
-			start = get_preferred_edit_position();
+			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 > end ) {
-			end = max_framepos;
+		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, end);
+
+		selection->set (start.frame, end.frame);
 
 		//if session is playing a range, cancel that
 		if (_session->get_play_range())
@@ -106,5 +109,5 @@ Editor::keyboard_selection_begin ()
 void
 Editor::keyboard_paste ()
 {
-	paste (1);
+	paste (1, false);
 }