Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / route_time_axis.h

diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index d6ea6f4124f43f7351b7ca5fcb99d104164b3e89..7a01ece03cc417e5cf24b925f56474031f2f5b10 100644 (file)
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -82,7 +82,7 @@ public:
        void show_selection (TimeSelection&);
        void set_button_names ();
 
-       void set_frames_per_pixel (double);
+       void set_samples_per_pixel (double);
        void set_height (uint32_t h);
        void show_timestretch (framepos_t start, framepos_t end, int layers, int layer);
        void hide_timestretch ();
@@ -211,7 +211,7 @@ protected:
 
        virtual void label_view ();
 
-       void reset_frames_per_pixel ();
+       void reset_samples_per_pixel ();
        void horizontal_position_changed ();
 
        virtual void build_automation_action_menu (bool);