diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-06-14 10:50:40 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-06-14 10:50:40 -0400 |
| commit | 46b6987311a305c1de718f8e73f365b796572c45 (patch) | |
| tree | aa666567707104a066c1fcc06688e11daf913df5 /gtk2_ardour/video_timeline.cc | |
| parent | f00b3b7f111e36537d773daef0ae77b03d11f82f (diff) | |
fix merge of master
frames => samples rename in cairocanvas branch caused minor breakage
Diffstat (limited to 'gtk2_ardour/video_timeline.cc')
| -rw-r--r-- | gtk2_ardour/video_timeline.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc index 6f2c34dd91..265c60c708 100644 --- a/gtk2_ardour/video_timeline.cc +++ b/gtk2_ardour/video_timeline.cc @@ -346,10 +346,10 @@ VideoTimeLine::update_video_timeline() assert (vtl_dist > 0); assert (apv > 0); - leftmost_video_frame = floor (floor((leftmost_frame - video_start_offset - video_offset ) / vtl_dist) * vtl_dist / apv); + leftmost_video_frame = floor (floor((leftmost_sample - video_start_offset - video_offset ) / vtl_dist) * vtl_dist / apv); vtl_start = rint (video_offset + video_start_offset + leftmost_video_frame * apv); - visible_video_frames = 2 + ceil(editor->current_page_frames() / vtl_dist); /* +2 left+right partial frames */ + visible_video_frames = 2 + ceil(editor->current_page_samples() / vtl_dist); /* +2 left+right partial frames */ /* expand timeline (cache next/prev page images) */ vtl_start -= visible_video_frames * vtl_dist; |