summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_rulers.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-11-09 03:36:24 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-11-09 03:36:24 +0000
commit96fa1cd0b636d47d4b0787281fc9401693a77af9 (patch)
treea722434f290aab01b28b090f5b20bda0d7ad15cd /gtk2_ardour/editor_rulers.cc
parenta8d2605f9a6f48f3afb09c212de9486c75856287 (diff)
the edit cursor is dead, long live the edit point; plus a few fixes; plus location locking
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2610 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_rulers.cc')
-rw-r--r--gtk2_ardour/editor_rulers.cc24
1 files changed, 11 insertions, 13 deletions
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 8e658f041f..0df011a38f 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -163,12 +163,12 @@ Editor::ruler_button_press (GdkEventButton* ev)
break;
case 2:
- /* edit cursor */
- if (snap_type != Editing::SnapToEditCursor) {
+ /* edit point */
+ if (snap_type != Editing::SnapToEditPoint) {
snap_to (where);
}
- edit_cursor->set_position (where);
- edit_cursor_clock.set (where);
+ // EDIT CURSOR XXX what to do here edit_cursor->set_position (where);
+ // EDIT CURSOR XXX what to do here edit_cursor_clock.set (where);
break;
default:
@@ -206,12 +206,12 @@ Editor::ruler_button_release (GdkEventButton* ev)
break;
case 2:
- /* edit cursor */
- if (snap_type != Editing::SnapToEditCursor) {
+ /* edit point */
+ if (snap_type != Editing::SnapToEditPoint) {
snap_to (where);
}
- edit_cursor->set_position (where);
- edit_cursor_clock.set (where);
+ // EDIT CURSOR XXX what to do here edit_cursor->set_position (where);
+ // ditto XXX edit_cursor_clock.set (where);
break;
case 3:
@@ -298,8 +298,8 @@ Editor::ruler_mouse_motion (GdkEventMotion* ev)
break;
case 2:
- /* edit cursor */
- cursor = edit_cursor;
+ /* edit point */
+ // EDIT CURSOR XXX do something useful
break;
default:
@@ -309,9 +309,7 @@ Editor::ruler_mouse_motion (GdkEventMotion* ev)
if (cursor) {
cursor->set_position (where);
- if (cursor == edit_cursor) {
- edit_cursor_clock.set (where);
- } else if (cursor == playhead_cursor) {
+ if (cursor == playhead_cursor) {
UpdateAllTransportClocks (cursor->current_frame);
}
}