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

1 files changed, 11 insertions, 13 deletions

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 1eda8fd360..5b1c57044e 100644
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -21,8 +21,6 @@
 
 #include <vector>
 
-#include <libgnomecanvasmm.h>
-#include <libgnomecanvasmm/polygon.h>
 #include <sigc++/signal.h>
 #include "ardour/region.h"
 #include "ardour/beats_frames_converter.h"
@@ -30,7 +28,6 @@
 #include "time_axis_view_item.h"
 #include "automation_line.h"
 #include "enums.h"
-#include "canvas.h"
 
 class TimeAxisView;
 class RegionEditor;
@@ -38,9 +35,10 @@ class GhostRegion;
 class AutomationTimeAxisView;
 class AutomationRegionView;
 
-namespace Gnome { namespace Canvas {
-	class NoEventText;
-} }
+namespace ArdourCanvas {
+	class Polygon;
+	class Text;
+}
 
 class RegionView : public TimeAxisViewItem
 {
@@ -48,7 +46,7 @@ class RegionView : public TimeAxisViewItem
 	RegionView (ArdourCanvas::Group* parent,
 	            TimeAxisView&        time_view,
 	            boost::shared_ptr<ARDOUR::Region> region,
-	            double               samples_per_unit,
+	            double               frames_per_pixel,
 	            Gdk::Color const &   basic_color,
 		    bool 		 automation = false);
 
@@ -66,7 +64,7 @@ class RegionView : public TimeAxisViewItem
 	void set_valid (bool yn) { valid = yn; }
 
 	virtual void set_height (double);
-	virtual void set_samples_per_unit (double);
+	virtual void set_frames_per_pixel (double);
 	virtual bool set_duration (framecnt_t, void*);
 
 	void move (double xdelta, double ydelta);
@@ -130,7 +128,7 @@ class RegionView : public TimeAxisViewItem
 	RegionView (ArdourCanvas::Group *,
 		    TimeAxisView&,
 		    boost::shared_ptr<ARDOUR::Region>,
-		    double samples_per_unit,
+		    double frames_per_pixel,
 		    Gdk::Color const & basic_color,
 		    bool recording,
 		    TimeAxisViewItem::Visibility);
@@ -176,17 +174,17 @@ class RegionView : public TimeAxisViewItem
 	    different bits of regions according to whether or not they are the one
 	    that will be played at any given time.
 	*/
-	std::list<ArdourCanvas::SimpleRect*> _coverage_frames;
+	std::list<ArdourCanvas::Rectangle*> _coverage_frames;
 
 	/** a list of rectangles used to show silent segments
 	*/
-	std::list<ArdourCanvas::SimpleRect*> _silent_frames;
+	std::list<ArdourCanvas::Rectangle*> _silent_frames;
 	/** a list of rectangles used to show the current silence threshold
 	*/
-	std::list<ArdourCanvas::SimpleRect*> _silent_threshold_frames;
+	std::list<ArdourCanvas::Rectangle*> _silent_threshold_frames;
         /** a text item to display strip silence statistics
          */
-        ArdourCanvas::NoEventText* _silence_text;
+        ArdourCanvas::Text* _silence_text;
 
 	ARDOUR::BeatsFramesConverter _region_relative_time_converter;
 	ARDOUR::BeatsFramesConverter _source_relative_time_converter;