Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / automation_region_view.h

diff --git a/gtk2_ardour/automation_region_view.h b/gtk2_ardour/automation_region_view.h
index 3e2a9b6bbff531965fcadc5fb471d14f148d88a3..571a80709a3149d246bb339d6697191fa5c95832 100644 (file)
--- a/gtk2_ardour/automation_region_view.h
+++ b/gtk2_ardour/automation_region_view.h
@@ -26,7 +26,6 @@
 #include "automation_time_axis.h"
 #include "automation_line.h"
 #include "enums.h"
-#include "canvas.h"
 
 namespace ARDOUR {
        class AutomationList;
@@ -43,7 +42,7 @@ public:
                             boost::shared_ptr<ARDOUR::Region>,
                             const Evoral::Parameter& parameter,
                             boost::shared_ptr<ARDOUR::AutomationList>,
-                            double initial_samples_per_unit,
+                            double initial_samples_per_pixel,
                             Gdk::Color const & basic_color);
 
        ~AutomationRegionView();