Merge branch 'master' 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 b4f53b59215cfe66f77a66a492d420e24daf3d3f..571a80709a3149d246bb339d6697191fa5c95832 100644 (file)
--- 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;
@@ -44,17 +42,16 @@ public:
                             boost::shared_ptr<ARDOUR::Region>,
                             const Evoral::Parameter& parameter,
                             boost::shared_ptr<ARDOUR::AutomationList>,
-                            double initial_samples_per_unit,
+                            double initial_samples_per_pixel,
                             Gdk::Color const & basic_color);
 
-       ~AutomationRegionView() {}
+       ~AutomationRegionView();
 
        void init (Gdk::Color const & basic_color, 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.
@@ -65,11 +62,11 @@ public:
 
 protected:
        void create_line(boost::shared_ptr<ARDOUR::AutomationList> list);
-       bool set_position(nframes64_t pos, void* src, double* ignored);
-       void region_resized (PBD::Change 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);
+       void entered (bool);
        void exited();
 
 private: