Fix problems with summary when the session start marker is not at zero (#2924)
git-svn-id: svn://localhost/ardour2/branches/3.0@6169 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
c2a7ad0724
commit
1c5d13938a
@ -102,7 +102,7 @@ EditorSummary::on_expose_event (GdkEventExpose* event)
|
|||||||
/* XXX: colour should be set from configuration file */
|
/* XXX: colour should be set from configuration file */
|
||||||
cairo_set_source_rgba (cr, 1, 0, 0, 1);
|
cairo_set_source_rgba (cr, 1, 0, 0, 1);
|
||||||
|
|
||||||
double const p = _editor->playhead_cursor->current_frame * _x_scale;
|
double const p = (_editor->playhead_cursor->current_frame - _session->current_start_frame()) * _x_scale;
|
||||||
cairo_move_to (cr, p, 0);
|
cairo_move_to (cr, p, 0);
|
||||||
cairo_line_to (cr, p, _height);
|
cairo_line_to (cr, p, _height);
|
||||||
cairo_stroke (cr);
|
cairo_stroke (cr);
|
||||||
@ -412,7 +412,7 @@ EditorSummary::set_editor (pair<double,double> const & x, pair<double, double> c
|
|||||||
is merely pending but not executing. But c'est la vie.
|
is merely pending but not executing. But c'est la vie.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
_editor->reset_x_origin (x.first / _x_scale);
|
_editor->reset_x_origin (x.first / _x_scale + _session->current_start_frame ());
|
||||||
_editor->reset_y_origin (y.first / _y_scale);
|
_editor->reset_y_origin (y.first / _y_scale);
|
||||||
|
|
||||||
double const nx = (
|
double const nx = (
|
||||||
|
Loading…
Reference in New Issue
Block a user