summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor.cc
diff options
context:
space:
mode:
authorBen Loftis <ben@harrisonconsoles.com>2015-01-08 16:00:36 -0600
committerBen Loftis <ben@harrisonconsoles.com>2015-01-08 16:00:49 -0600
commitf7e3d1be2c3cad8e3c7ac9910970c6bd87d3f536 (patch)
treea89390fe404542cd37e1fca98a80a543ac0eb9f4 /gtk2_ardour/editor.cc
parent5ab70b6822fde1b1d0378e525098092ab0cab201 (diff)
change Split menu entry to say Split/Separate (it was already doing that anyway). also fix a bug so you can drag the playhead and split at the playhead location
Diffstat (limited to 'gtk2_ardour/editor.cc')
-rw-r--r--gtk2_ardour/editor.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 7107040db1..da1c25f374 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -4638,7 +4638,13 @@ Editor::get_preferred_edit_position (bool ignore_playhead, bool from_context_men
switch (ep) {
case EditAtPlayhead:
- where = _session->audible_frame();
+ if (_dragging_playhead) {
+ if (!mouse_frame (where, ignored)) {
+ /* XXX not right but what can we do ? */
+ return 0;
+ }
+ } else
+ where = _session->audible_frame();
DEBUG_TRACE (DEBUG::CutNPaste, string_compose ("GPEP: use playhead @ %1\n", where));
break;