Gnome::Canvas -> ArdourCanvas and some other small fixes

git-svn-id: svn://localhost/trunk/ardour2@107 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 5 insertions, 5 deletions

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 2913aaea2d..3e376d34d7 100644
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -26,11 +26,11 @@
 #include <cmath>
 
 #include <gtkmm.h>
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
 
 #include <ardour/location.h>
 #include "enums.h"
 #include "simplerect.h"
+#include "canvas.h"
 
 namespace ARDOUR {
 	class Route;
@@ -42,7 +42,7 @@ namespace ARDOUR {
 }
 
 struct RecBoxInfo {
-        Gnome::Canvas::SimpleRect* rectangle;
+        ArdourCanvas::SimpleRect* rectangle;
 	jack_nframes_t start;
 	jack_nframes_t length;
 };
@@ -79,7 +79,7 @@ class StreamView : public sigc::trackable
 	void set_show_waveforms (bool yn);
 	void set_show_waveforms_recording (bool yn) { use_rec_regions = yn; }
 
-	Gnome::Canvas::Item* canvas_item() { return canvas_group; }
+	ArdourCanvas::Item* canvas_item() { return canvas_group; }
 
 	sigc::signal<void,AudioRegionView*> AudioRegionViewAdded;
 
@@ -111,8 +111,8 @@ class StreamView : public sigc::trackable
   private:
 	AudioTimeAxisView& _trackview;
 
-	Gnome::Canvas::Group* canvas_group;
-	Gnome::Canvas::SimpleRect* canvas_rect; /* frame around the whole thing */
+	ArdourCanvas::Group* canvas_group;
+	ArdourCanvas::SimpleRect* canvas_rect; /* frame around the whole thing */
 
 	typedef list<AudioRegionView* > AudioRegionViewList;
 	AudioRegionViewList region_views;