amend to 930fce

This commit is contained in:
Robin Gareus 2013-04-17 03:34:54 +02:00
parent 6a4cddbc4c
commit 5285d21e35

View file

@ -48,10 +48,10 @@ VideoImageFrame::VideoImageFrame (PublicEditor& ed, ArdourCanvas::Group& parent,
queued_request=false; queued_request=false;
video_frame_number = -1; video_frame_number = -1;
rightend = -1; rightend = -1;
frame_position = 0; sample_position = 0;
thread_active=false; thread_active=false;
unit_position = editor.sample_to_pixel (frame_position); unit_position = editor.sample_to_pixel (sample_position);
image = new ArdourCanvas::Image (_parent, Cairo::FORMAT_ARGB32, clip_width, clip_height); image = new ArdourCanvas::Image (_parent, Cairo::FORMAT_ARGB32, clip_width, clip_height);
img = image->get_image(); img = image->get_image();
@ -72,18 +72,18 @@ VideoImageFrame::~VideoImageFrame ()
} }
void void
VideoImageFrame::set_position (framepos_t frame) VideoImageFrame::set_position (framepos_t sample)
{ {
double new_unit_position = editor.sample_to_pixel (frame); double new_unit_position = editor.sample_to_pixel (frame);
image->move (ArdourCanvas::Duple (new_unit_position - unit_position, 0.0)); image->move (ArdourCanvas::Duple (new_unit_position - unit_position, 0.0));
frame_position = frame; sample_position = sample;
unit_position = new_unit_position; unit_position = new_unit_position;
} }
void void
VideoImageFrame::reposition () VideoImageFrame::reposition ()
{ {
set_position (frame_position); set_position (sample_position);
} }
void void