X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_keys.cc;h=e1562dbe053ae78031185d82f478453c0604fd33;hb=1de584961a746090583a4c97251f25924d6e03ad;hp=2acc8a0a86768571eeaf316608e5fbd2bf5f0f43;hpb=779fe6c08291a2c041ec9558c5351c23de576238;p=ardour.git

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index 2acc8a0a86..e1562dbe05 100644
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -27,35 +27,34 @@
 
 #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();
 		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();
@@ -70,7 +69,7 @@ Editor::keyboard_selection_finish (bool /*add*/)
 }
 
 void
-Editor::keyboard_selection_begin ()
+Editor::keyboard_selection_begin (Editing::EditIgnoreOption ign)
 {
 	if (_session) {
 
@@ -80,21 +79,21 @@ Editor::keyboard_selection_begin ()
 		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 ) {
 			end = max_framepos;
 		}
-		
+
 		//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
@@ -106,5 +105,5 @@ Editor::keyboard_selection_begin ()
 void
 Editor::keyboard_paste ()
 {
-	paste (1);
+	paste (1, false);
 }