Merge branch 'windows' into windows+cc

[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 7706ed7ee31469bb97f4429468857c03d8232dfa..d388419e177ab6d2a30ba4ed838f4859ebb3221f 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,7 +69,7 @@ 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);
@@ -86,15 +86,13 @@ class AutomationTimeAxisView : public TimeAxisView {
        void get_selectables (ARDOUR::framepos_t start, ARDOUR::framepos_t end, double top, double bot, std::list<Selectable *>&);
        void get_inverted_selectables (Selection&, std::list<Selectable*>& results);
 
-       void show_timestretch (framepos_t /*start*/, framepos_t /*end*/) {}
+       void show_timestretch (framepos_t /*start*/, framepos_t /*end*/, int /*layers*/, int /*layer*/) {}
        void hide_timestretch () {}
 
        /* editing operations */
 
        void cut_copy_clear (Selection&, Editing::CutCopyOp);
-       void cut_copy_clear_objects (PointSelection&, Editing::CutCopyOp);
        bool paste (ARDOUR::framepos_t, float times, Selection&, size_t nth);
-       void reset_objects (PointSelection&);
 
        int  set_state (const XMLNode&, int version);
 
@@ -134,7 +132,7 @@ 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;
 
        /** AutomationStreamView if we are editing region-based automation (for MIDI), otherwise 0 */
@@ -170,9 +168,7 @@ class AutomationTimeAxisView : public TimeAxisView {
        void build_display_menu ();
 
        void cut_copy_clear_one (AutomationLine&, Selection&, Editing::CutCopyOp);
-       void cut_copy_clear_objects_one (AutomationLine&, PointSelection&, Editing::CutCopyOp);
        bool paste_one (AutomationLine&, ARDOUR::framepos_t, float times, Selection&, size_t nth);
-       void reset_objects_one (AutomationLine&, PointSelection&);
        void route_going_away ();
 
        void set_automation_state (ARDOUR::AutoState);