6 files changed, 7 insertions, 14 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 1e1e2f9883..cf348bf532 100644
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -40,6 +40,7 @@
 #include "canvas/rectangle.h"
 #include "canvas/polygon.h"
 #include "canvas/poly_line.h"
+#include "canvas/line.h"
 #include "canvas/pixbuf.h"
 
 #include "streamview.h"
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index 02ce72149f..460802309a 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -91,7 +91,7 @@ AutomationLine::AutomationLine (const string& name, TimeAxisView& tv, ArdourCanv
 
 	group = new ArdourCanvas::Group (&parent);
 
-	line = new ArdourCanvas::PolyLine (group);
+	line = new ArdourCanvas::Curve (group);
 	line->set_outline_width (1);
 	line->set_data ("line", this);
 
diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 2b41647fe0..816105b1e5 100644
--- 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 */
 
diff --git a/gtk2_ardour/control_point.cc b/gtk2_ardour/control_point.cc
index 8e05ad0a0b..a3c2c1874b 100644
--- a/gtk2_ardour/control_point.cc
+++ b/gtk2_ardour/control_point.cc
@@ -122,14 +122,6 @@ ControlPoint::visible () const
 void
 ControlPoint::reset (double x, double y, AutomationList::iterator mi, uint32_t vi, ShapeType shape)
 {
-	/* If this is too big, libart will confuse itself and segfault after it casts the bounding box
-	   of this automation line to ints.  Sigh.
-	*/
-
-	if (x > INT32_MAX) {
-		x = INT32_MAX;
-	}
-
 	_model = mi;
 	_view_index = vi;
 	move_to (x, y, shape);
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc
index 8451497289..824026ff6e 100644
--- a/gtk2_ardour/region_view.cc
+++ b/gtk2_ardour/region_view.cc
@@ -32,6 +32,7 @@
 #include "canvas/debug.h"
 #include "canvas/pixbuf.h"
 #include "canvas/text.h"
+#include "canvas/line.h"
 
 #include "ardour_ui.h"
 #include "global_signals.h"
diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 5b1c57044e..f94fc8ed8d 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -25,6 +25,8 @@
 #include "ardour/region.h"
 #include "ardour/beats_frames_converter.h"
 
+#include "canvas/fwd.h"
+
 #include "time_axis_view_item.h"
 #include "automation_line.h"
 #include "enums.h"