merge exportvis branch into cairocanvas, to reduce the number of "floating" branches.

[ardour.git] / gtk2_ardour / automation_region_view.cc

diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index f48fec43b95ed0a8a61276560ee97598398f5453..0f62d3636cfd6746dcfcd67141cdcf2158a72b5d 100644 (file)
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -69,7 +69,7 @@ AutomationRegionView::init (Gdk::Color const & basic_color, bool /*wfd*/)
 
        compute_colors (basic_color);
 
-       reset_width_dependent_items ((double) _region->length() / frames_per_pixel);
+       reset_width_dependent_items ((double) _region->length() / samples_per_pixel);
 
        set_height (trackview.current_height());
 
@@ -120,7 +120,7 @@ AutomationRegionView::canvas_event (GdkEvent* ev)
                y = std::max (y, 0.0);
                y = std::min (y, _height - NAME_HIGHLIGHT_SIZE);
 
-               add_automation_event (ev, trackview.editor().pixel_to_frame (x) - _region->position() + _region->start(), y);
+               add_automation_event (ev, trackview.editor().pixel_to_sample (x) - _region->position() + _region->start(), y);
        }
 
        return false;