Merge branch 'canvasredesign' 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 571a80709a3149d246bb339d6697191fa5c95832..dd9d6a7f82e3ce063515677474dc4bd530ee62c5 100644 (file)
--- a/gtk2_ardour/automation_region_view.h
+++ b/gtk2_ardour/automation_region_view.h
@@ -37,17 +37,17 @@ class TimeAxisView;
 class AutomationRegionView : public RegionView
 {
 public:
-       AutomationRegionView(ArdourCanvas::Group*,
+       AutomationRegionView(ArdourCanvas::Layout*,
                             AutomationTimeAxisView&,
                             boost::shared_ptr<ARDOUR::Region>,
                             const Evoral::Parameter& parameter,
                             boost::shared_ptr<ARDOUR::AutomationList>,
                             double initial_samples_per_pixel,
-                            Gdk::Color const & basic_color);
+                            uint32_t basic_color);
 
        ~AutomationRegionView();
 
-       void init (Gdk::Color const & basic_color, bool wfd);
+       void init (bool wfd);
 
        inline AutomationTimeAxisView* automation_view() const
                { return dynamic_cast<AutomationTimeAxisView*>(&trackview); }
@@ -55,7 +55,7 @@ public:
        boost::shared_ptr<AutomationLine> line() { return _line; }
 
        // We are a ghost.  Meta ghosts?  Crazy talk.
-       virtual GhostRegion* add_ghost(TimeAxisView&) { return NULL; }
+       virtual GhostRegion* add_ghost(TimeAxisView&) { return 0; }
 
        void set_height (double);
        void reset_width_dependent_items(double pixel_width);
@@ -65,7 +65,7 @@ protected:
        bool set_position(framepos_t pos, void* src, double* ignored);
        void region_resized (const PBD::PropertyChange&);
        bool canvas_event(GdkEvent* ev);
-       void add_automation_event (GdkEvent* event, framepos_t when, double y);
+        void add_automation_event (GdkEvent* event, framepos_t when, double y, bool with_guard_points);
        void entered (bool);
        void exited();