summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_rulers.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-08-27 13:00:08 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-08-27 13:00:08 +0000
commit8755c7124512613f4bfa74b13887285c64146747 (patch)
tree5c3d11ea633ce8be348fb9d0cfa26fb9b48ef9ff /gtk2_ardour/editor_rulers.cc
parent5172282a44d477d21a85eacd1ede8242885bb6b5 (diff)
opaque xfade patch + a version of the editor ruler/playhead/click patch
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2350 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_rulers.cc')
-rw-r--r--gtk2_ardour/editor_rulers.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 2370d8406c..8e658f041f 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -151,14 +151,14 @@ Editor::ruler_button_press (GdkEventButton* ev)
switch (ev->button) {
case 1:
- // Since we are about to move the playhead, cancel any running
+ // Since we will locate the playhead on button release, cancel any running
// auditions.
if (session->is_auditioning()) {
session->cancel_audition ();
}
- /* transport playhead */
+ /* playhead cursor */
snap_to (where);
- session->request_locate (where);
+ playhead_cursor->set_position (where);
_dragging_playhead = true;
break;
@@ -202,7 +202,7 @@ Editor::ruler_button_release (GdkEventButton* ev)
/* transport playhead */
_dragging_playhead = false;
snap_to (where);
- session->request_locate (where);
+ session->request_locate (where, session->transport_rolling());
break;
case 2: