summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_canvas.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-04-12 11:15:45 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-04-12 11:15:45 -0400
commit4258a349121392516543486bd9de6f13fe3f3331 (patch)
tree3cd0c6b61a58e006483d0782326b43246d9eb55e /gtk2_ardour/editor_canvas.cc
parentecfd2a74552a45781e4d57a09e73313cd8815a4d (diff)
change all frame_to_pixel and pixel_to_frame to sample_to_pixel and pixel_to_sample
Diffstat (limited to 'gtk2_ardour/editor_canvas.cc')
-rw-r--r--gtk2_ardour/editor_canvas.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 5b5ae3e0de..da6749c3f8 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -493,9 +493,9 @@ Editor::maybe_autoscroll (bool allow_horiz, bool allow_vert, bool moving_left, b
Gtk::Allocation editor_list = _the_notebook.get_allocation ();
- framecnt_t distance = pixel_to_frame (root_rect.get_x() + root_rect.get_width() - window_rect.get_x() - window_rect.get_width());
+ framecnt_t distance = pixel_to_sample (root_rect.get_x() + root_rect.get_width() - window_rect.get_x() - window_rect.get_width());
if (_the_notebook.is_visible ()) {
- distance += pixel_to_frame (editor_list.get_width());
+ distance += pixel_to_sample (editor_list.get_width());
}
/* Note whether we're fudging the autoscroll (see autoscroll_fudge_threshold) */
@@ -912,7 +912,7 @@ Editor::update_canvas_now ()
double
Editor::horizontal_position () const
{
- return frame_to_pixel (leftmost_frame);
+ return sample_to_pixel (leftmost_frame);
}
void