clean up a-pong

[ardour.git] / gtk2_ardour / editor_keys.cc

diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index a2ee3574363d46ce1750170f98606b9a7751d4bb..e1562dbe053ae78031185d82f478453c0604fd33 100644 (file)
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -32,14 +32,14 @@
 #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) {
 
@@ -49,7 +49,7 @@ Editor::keyboard_selection_finish (bool /*add*/)
                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
@@ -69,7 +69,7 @@ Editor::keyboard_selection_finish (bool /*add*/)
 }
 
 void
-Editor::keyboard_selection_begin ()
+Editor::keyboard_selection_begin (Editing::EditIgnoreOption ign)
 {
        if (_session) {
 
@@ -79,7 +79,7 @@ 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
@@ -105,5 +105,5 @@ Editor::keyboard_selection_begin ()
 void
 Editor::keyboard_paste ()
 {
-       paste (1);
+       paste (1, false);
 }