Remove 'pipex' from my pbd.vcproj as it's not needed for Ardour3

[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 f1a9a8bd57327a35a7da6c81d9b4cb02f53a6196..c169cb59d09aa76da90d2b14531723c46086caf2 100644 (file)
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -30,9 +30,9 @@
 #include "ardour/automatable.h"
 #include "ardour/automation_list.h"
 
-#include "canvas.h"
+#include "canvas/rectangle.h"
+
 #include "time_axis_view.h"
-#include "simplerect.h"
 #include "automation_controller.h"
 
 namespace ARDOUR {
@@ -69,10 +69,10 @@ class AutomationTimeAxisView : public TimeAxisView {
        ~AutomationTimeAxisView();
 
        virtual void set_height (uint32_t);
-       void set_samples_per_unit (double);
+       void set_samples_per_pixel (double);
        std::string name() const { return _name; }
 
-       void add_automation_event (GdkEvent *, framepos_t, double);
+        void add_automation_event (GdkEvent *, framepos_t, double, bool with_guard_points);
 
        void clear_lines ();
 
@@ -132,15 +132,15 @@ class AutomationTimeAxisView : public TimeAxisView {
        boost::shared_ptr<AutomationController> _controller;
        Evoral::Parameter _parameter;
 
-       ArdourCanvas::SimpleRect* _base_rect;
+       ArdourCanvas::Rectangle* _base_rect;
        boost::shared_ptr<AutomationLine> _line;
 
+       std::string _name;
+
        /** AutomationStreamView if we are editing region-based automation (for MIDI), otherwise 0 */
        AutomationStreamView* _view;
 
-       std::string _name;
        bool    ignore_toggle;
-
        bool    first_call_to_set_height;
 
        Gtk::Button        hide_button;