convert property_foo().set_value(bar) to property_foo() = bar

[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 55f402aa1c485c3e1c3b65ff205eccd488f14315..2dc43853a2b18bd92b902dd0376e169c59574d28 100644 (file)
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -6,7 +6,9 @@
 #include <string>
 #include <ardour/types.h>
 
+#include "canvas.h"
 #include "time_axis_view.h"
+#include "simplerect.h"
 
 using std::vector;
 using std::list;
@@ -17,10 +19,6 @@ namespace ARDOUR {
        class Route;
 }
 
-namespace Gtk {
-       class Widget;
-}
-
 class PublicEditor;
 class TimeSelection;
 class AudioRegionSelection;
@@ -36,7 +34,7 @@ class AutomationTimeAxisView : public TimeAxisView {
                                ARDOUR::Route&,
                                PublicEditor&,
                                TimeAxisView& parent,
-                               Gtk::Widget* parent,
+                               ArdourCanvas::Canvas& canvas,
                                std::string name, /* translatable */
                                std::string state_name, /* not translatable */
                                std::string plug_name = "");
@@ -47,7 +45,7 @@ class AutomationTimeAxisView : public TimeAxisView {
        void set_samples_per_unit (double);
        std::string name() const { return _name; }
 
-       virtual void add_automation_event (GtkCanvasItem *item, GdkEvent *event, jack_nframes_t, double) = 0;
+       virtual void add_automation_event (ArdourCanvas::Item *item, GdkEvent *event, jack_nframes_t, double) = 0;
 
        void clear_lines ();
        void add_line (AutomationLine&);
@@ -77,7 +75,7 @@ class AutomationTimeAxisView : public TimeAxisView {
 
   protected:
        ARDOUR::Route& route;
-       GtkCanvasItem* base_rect;
+       ArdourCanvas::SimpleRect* base_rect;
        string _name;
        string _state_name;
        bool    in_destructor;
@@ -112,7 +110,7 @@ class AutomationTimeAxisView : public TimeAxisView {
        bool ignore_state_request;
 
        void automation_state_changed ();
-       SigC::Connection automation_connection;
+       sigc::connection automation_connection;
 
        void entered ();
        void exited ();