initial commit of hand merging, plus getting "ancient" waf script to work correctly

1 files changed, 14 insertions, 6 deletions

diff --git a/gtk2_ardour/crossfade_edit.h b/gtk2_ardour/crossfade_edit.h
index fab459c54f..5d9e665ba0 100644
--- a/gtk2_ardour/crossfade_edit.h
+++ b/gtk2_ardour/crossfade_edit.h
@@ -26,11 +26,12 @@
 #include <gtkmm/button.h>
 #include <gtkmm/radiobutton.h>
 
+#include "canvas/canvas.h"
+
 #include "evoral/Curve.hpp"
 #include "ardour/session_handle.h"
 
 #include "ardour_dialog.h"
-#include "canvas.h"
 
 namespace ARDOUR
 {
@@ -39,6 +40,13 @@ namespace ARDOUR
 	class Crossfade;
 }
 
+namespace ArdourCanvas {
+	class Rectangle;
+	class Line;
+	class Polygon;
+	class WaveView;
+}
+
 class CrossfadeEditor : public ArdourDialog
 {
   public:
@@ -87,8 +95,8 @@ class CrossfadeEditor : public ArdourDialog
 	struct Point {
 	    ~Point();
 
-	    ArdourCanvas::SimpleRect* box;
-	    ArdourCanvas::Line* curve;
+	    ArdourCanvas::Rectangle* box;
+	    ArdourCanvas::PolyLine* curve;
 	    double x;
 	    double y;
 
@@ -103,11 +111,11 @@ class CrossfadeEditor : public ArdourDialog
 	    }
 	};
 
-	ArdourCanvas::SimpleRect*   toplevel;
-	ArdourCanvas::Canvas* canvas;
+	ArdourCanvas::Rectangle*   toplevel;
+	ArdourCanvas::GtkCanvas* canvas;
 
 	struct Half {
-	    ArdourCanvas::Line*     line;
+	    ArdourCanvas::PolyLine* line;
 	    ArdourCanvas::Polygon*  shading;
 	    std::list<Point*>       points;
 	    ARDOUR::AutomationList  normative_curve; /* 0 - 1.0, linear */