remove all unit-based methods from (Public)Editor; rationalize Editor::event_frame() to clearly identify whether the passed-in GdkEvent has window units or canvas units (the latter will be true for all events that are handled by the canvas and then passed to Editor

1 files changed, 2 insertions, 2 deletions

diff --git a/gtk2_ardour/video_image_frame.cc b/gtk2_ardour/video_image_frame.cc
index 418848898f..8e7100113e 100644
--- a/gtk2_ardour/video_image_frame.cc
+++ b/gtk2_ardour/video_image_frame.cc
@@ -56,7 +56,7 @@ VideoImageFrame::VideoImageFrame (PublicEditor& ed, ArdourCanvas::Group& parent,
 	printf("New VideoImageFrame (%ix%i) %s - %s\n", w, h, vsurl.c_str(), vfn.c_str());
 #endif
 
-	unit_position = editor.frame_to_unit (frame_position);
+	unit_position = editor.frame_to_pixel (frame_position);
 	group = new ArdourCanvas::Group (_parent, ArdourCanvas::Duple(unit_position, 1.0));
 	img_pixbuf = new ArdourCanvas::Pixbuf(group);
 
@@ -85,7 +85,7 @@ VideoImageFrame::~VideoImageFrame ()
 void
 VideoImageFrame::set_position (framepos_t frame)
 {
-	double new_unit_position = editor.frame_to_unit (frame);
+	double new_unit_position = editor.frame_to_pixel (frame);
 	group->move (ArdourCanvas::Duple (new_unit_position - unit_position, 0.0));
 	frame_position = frame;
 	unit_position = new_unit_position;