Merge branch 'export-dialog' into cairocanvas

[ardour.git] / gtk2_ardour / automation_line.h

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 054e84e7892d162653dc0df6d33ecf6326e0513b..dcd81c8b4eb31a10b29d4e22780ed47111f10dad 100644 (file)
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -25,10 +25,7 @@
 #include <string>
 #include <sys/types.h>
 
-#include <libgnomecanvasmm/line.h>
 #include <sigc++/signal.h>
-#include "canvas.h"
-#include "simplerect.h"
 
 #include "evoral/TimeConverter.hpp"
 
@@ -39,6 +36,10 @@
 #include "ardour/automation_list.h"
 #include "ardour/types.h"
 
+#include "canvas/types.h"
+#include "canvas/group.h"
+#include "canvas/poly_line.h"
+
 class AutomationLine;
 class ControlPoint;
 class PointSelection;
@@ -47,11 +48,6 @@ class AutomationTimeAxisView;
 class Selectable;
 class Selection;
 
-namespace Gnome {
-       namespace Canvas {
-               class SimpleRect;
-       }
-}
 
 /** A GUI representation of an ARDOUR::AutomationList */
 class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
@@ -178,7 +174,7 @@ protected:
 
        ArdourCanvas::Group&        _parent_group;
        ArdourCanvas::Group*        group;
-       ArdourCanvas::Line*         line; /* line */
+       ArdourCanvas::PolyLine*     line; /* line */
        ArdourCanvas::Points        line_points; /* coordinates for canvas line */
        std::vector<ControlPoint*>  control_points; /* visible control points */
 
@@ -222,7 +218,7 @@ private:
         */
        ARDOUR::framecnt_t _offset;
 
-       void show ();
+       void update_visibility ();
        void reset_line_coords (ControlPoint&);
        void add_visible_control_point (uint32_t, uint32_t, double, double, ARDOUR::AutomationList::iterator, uint32_t);
        double control_point_box_size ();