summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_keys.cc
diff options
context:
space:
mode:
authorBen Loftis <ben@harrisonconsoles.com>2016-01-28 13:43:47 -0600
committerBen Loftis <ben@harrisonconsoles.com>2016-01-28 13:46:33 -0600
commit3332633d199e14cc0948ad8da521e7a6a36237ee (patch)
treed50084d3dbb88cfaf80af86bce608701ec64b465 /gtk2_ardour/editor_keys.cc
parent458a2b723cedb967fe8cea7416b1cc26abf5e7ee (diff)
Editing from a control surface must have the ability to ignore mouse location.
Add mark_in and mark_out actions that explicitly use the playhead as the edit location.
Diffstat (limited to 'gtk2_ardour/editor_keys.cc')
-rw-r--r--gtk2_ardour/editor_keys.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index a2ee357436..ff4e9781cb 100644
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -39,7 +39,7 @@ 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) {
@@ -77,9 +77,11 @@ Editor::keyboard_selection_begin ()
framepos_t end = selection->time.end_frame(); //0 if no current selection
if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) {
+printf("if you don't wait a second, this wil be wrong");
start = _session->audible_frame();
} else {
- start = get_preferred_edit_position();
+printf("keyboard_selection_begin:: getting pref\n");
+ start = get_preferred_edit_position(ign);
}
//snap the selection start/end