/* transport playhead */
snap_to (where);
session->request_locate (where);
+ _dragging_playhead = true;
break;
case 2:
return FALSE;
}
- hide_verbose_canvas_cursor();
stop_canvas_autoscroll();
nframes_t where = leftmost_frame + pixel_to_frame (x);
switch (ev->button) {
case 1:
/* transport playhead */
+ _dragging_playhead = false;
snap_to (where);
session->request_locate (where);
break;
if (session == 0 || !ruler_pressed_button) {
return FALSE;
}
-
- double wcx=0,wcy=0;
+
+ double wcx=0,wcy=0;
double cx=0,cy=0;
gint x,y;
/* need to use the correct x,y, the event lies */
time_canvas_event_box.get_window()->get_pointer (x, y, state);
- time_canvas.c2w (x, y, wcx, wcy);
- time_canvas.w2c (wcx, wcy, cx, cy);
- wcx = x;
- nframes_t where = event_frame ((GdkEvent*) ev, &wcx, (double *) 0);
- cx = wcx;
+ track_canvas.c2w (x, y, wcx, wcy);
+ track_canvas.w2c (wcx, wcy, cx, cy);
+
+ nframes_t where = leftmost_frame + pixel_to_frame (x);
/// ripped from maybe_autoscroll, and adapted to work here
nframes_t one_page = (nframes_t) rint (canvas_width * frames_per_unit);
nframes_t rightmost_frame = leftmost_frame + one_page;
+ jack_nframes_t frame = pixel_to_frame (cx);
+
if (autoscroll_timeout_tag < 0) {
- if (where > rightmost_frame) {
+ if (frame > rightmost_frame) {
if (rightmost_frame < max_frames) {
start_canvas_autoscroll (1);
}
- } else if (where <= leftmost_frame) {
+ } else if (frame < leftmost_frame) {
if (leftmost_frame > 0) {
start_canvas_autoscroll (-1);
}
}
} else {
- if (where >= leftmost_frame && where < rightmost_frame) {
+ if (frame >= leftmost_frame && frame < rightmost_frame) {
stop_canvas_autoscroll ();
}
}
if (cursor == edit_cursor) {
edit_cursor_clock.set (where);
+ } else if (cursor == playhead_cursor) {
+ UpdateAllTransportClocks (cursor->current_frame);
}
-
- show_verbose_time_cursor (where, 10, cx, 0);
}
return TRUE;