Merge remote-tracking branch 'remotes/origin/master' into windows+cc

[ardour.git] / gtk2_ardour / automation_line.h

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 2b41647fe0d0088c78eb45faf97a68175a6ec160..816105b1e56b70c8333c5c6b2c0a775043200db4 100644 (file)
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -38,7 +38,7 @@
 
 #include "canvas/types.h"
 #include "canvas/group.h"
-#include "canvas/line.h"
+#include "canvas/curve.h"
 
 class AutomationLine;
 class ControlPoint;
@@ -48,9 +48,6 @@ class AutomationTimeAxisView;
 class Selectable;
 class Selection;
 
-namespace ArdourCanvas {
-       class Rectangle;
-}
 
 /** A GUI representation of an ARDOUR::AutomationList */
 class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
@@ -177,7 +174,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 
        ArdourCanvas::Group&        _parent_group;
        ArdourCanvas::Group*        group;
-       ArdourCanvas::PolyLine*     line; /* line */
+       ArdourCanvas::Curve*        line; /* line */
        ArdourCanvas::Points        line_points; /* coordinates for canvas line */
        std::vector<ControlPoint*>  control_points; /* visible control points */