Merge branch 'windows' into windows+cc

[ardour.git] / gtk2_ardour / automation_time_axis.h

diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index 4de120649b29aec58e9a01ea559898682e8784c5..d388419e177ab6d2a30ba4ed838f4859ebb3221f 100644 (file)
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -69,7 +69,7 @@ class AutomationTimeAxisView : public TimeAxisView {
        ~AutomationTimeAxisView();
 
        virtual void set_height (uint32_t);
-       void set_frames_per_pixel (double);
+       void set_samples_per_pixel (double);
        std::string name() const { return _name; }
 
        void add_automation_event (GdkEvent *, framepos_t, double);