X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_region_view.h;h=1dec06f0c63bc73ae269edc6ecfaee2cb443fde8;hb=c4be8c2a676adb0810fdc5d2a9dc1577f654a274;hp=0a1978c9636b15b6f713f07e59dd9f4c1da8ff60;hpb=ce7a5e1c9fa3edf2d9cc66875505e402a0aaa6f6;p=ardour.git

diff --git a/gtk2_ardour/automation_region_view.h b/gtk2_ardour/automation_region_view.h
index 0a1978c963..1dec06f0c6 100644
--- a/gtk2_ardour/automation_region_view.h
+++ b/gtk2_ardour/automation_region_view.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2007 Paul Davis
-    Author: Dave Robillard
+    Author: David Robillard
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,14 +20,12 @@
 #ifndef __gtk_ardour_automation_region_view_h__
 #define __gtk_ardour_automation_region_view_h__
 
-#include "ardour/diskstream.h"
 #include "ardour/types.h"
 
 #include "region_view.h"
 #include "automation_time_axis.h"
 #include "automation_line.h"
 #include "enums.h"
-#include "canvas.h"
 
 namespace ARDOUR {
 	class AutomationList;
@@ -39,37 +37,36 @@ class TimeAxisView;
 class AutomationRegionView : public RegionView
 {
 public:
-	AutomationRegionView(ArdourCanvas::Group*,
+	AutomationRegionView(ArdourCanvas::Container*,
 	                     AutomationTimeAxisView&,
 	                     boost::shared_ptr<ARDOUR::Region>,
 	                     const Evoral::Parameter& parameter,
 	                     boost::shared_ptr<ARDOUR::AutomationList>,
-	                     double initial_samples_per_unit,
-	                     Gdk::Color const & basic_color);
+	                     double initial_samples_per_pixel,
+	                     uint32_t basic_color);
 
-	~AutomationRegionView() {}
+	~AutomationRegionView();
 
-	void init (Gdk::Color const & basic_color, bool wfd);
+	void init (bool wfd);
 
 	inline AutomationTimeAxisView* automation_view() const
 		{ return dynamic_cast<AutomationTimeAxisView*>(&trackview); }
 
-	void set_line(boost::shared_ptr<AutomationLine> line) { _line = line; }
 	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);
 
 protected:
 	void create_line(boost::shared_ptr<ARDOUR::AutomationList> list);
-	bool set_position(nframes64_t pos, void* src, double* ignored);
-	void region_resized (PBD::PropertyChange what_changed);
+	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, nframes_t when, double y);
-	void entered();
+        void add_automation_event (GdkEvent* event, framepos_t when, double y, bool with_guard_points);
+	void entered (bool);
 	void exited();
 
 private: