summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-11-29 18:47:24 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-11-29 18:47:24 +0000
commit8dc368badd835faf08c86c8a377c4df2a9d4f596 (patch)
tree027f7d4a8364762f26f77bb6c568789c39240386 /gtk2_ardour/editor.cc
parent54cbca8aa3ea0cde814ed0eff3eb985977e3854f (diff)
fix bug with insert region when no track is selected; make keybindings editor show apple-like names for modifiers; fix range marker menu; fix mapping of keybindings to Quartz equivalents; make cycle-edit-point work without marker unless specifically requested
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2728 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor.cc')
-rw-r--r--gtk2_ardour/editor.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index a5310c76b7..5dfcff248e 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -3251,14 +3251,18 @@ Editor::snap_mode_selection_done ()
}
void
-Editor::cycle_edit_point ()
+Editor::cycle_edit_point (bool with_marker)
{
switch (_edit_point) {
case EditAtMouse:
set_edit_point_preference (EditAtPlayhead);
break;
case EditAtPlayhead:
- set_edit_point_preference (EditAtSelectedMarker);
+ if (with_marker) {
+ set_edit_point_preference (EditAtSelectedMarker);
+ } else {
+ set_edit_point_preference (EditAtMouse);
+ }
break;
case EditAtSelectedMarker:
set_edit_point_preference (EditAtMouse);