X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstreamview.h;h=3e376d34d7ac5b64ab9fe506b9e275701fb737fa;hb=aaa44a37aaf585b9bcd9268a9551a005e6269bdb;hp=6466a664983e44fcedeb1443c8c2c2b73f05ff0d;hpb=14d43ca9fe28a8309b4a52fa85e2b0c64a92248b;p=ardour.git

diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index 6466a66498..3e376d34d7 100644
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -26,10 +26,11 @@
 #include <cmath>
 
 #include <gtkmm.h>
-#include <libgnomecanvas/libgnomecanvas.h>
 
 #include <ardour/location.h>
 #include "enums.h"
+#include "simplerect.h"
+#include "canvas.h"
 
 namespace ARDOUR {
 	class Route;
@@ -41,7 +42,7 @@ namespace ARDOUR {
 }
 
 struct RecBoxInfo {
-	GnomeCanvasItem* rectangle;
+        ArdourCanvas::SimpleRect* rectangle;
 	jack_nframes_t start;
 	jack_nframes_t length;
 };
@@ -78,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; }
 
-	GnomeCanvasItem* canvas_item() { return canvas_group; }
+	ArdourCanvas::Item* canvas_item() { return canvas_group; }
 
 	sigc::signal<void,AudioRegionView*> AudioRegionViewAdded;
 
@@ -87,11 +88,11 @@ class StreamView : public sigc::trackable
 		StreamBaseColor
 	};
 
-	void apply_color (GdkColor&, ColorTarget t);
+	void apply_color (Gdk::Color&, ColorTarget t);
 	void set_selected_regionviews (AudioRegionSelection&);
 	void get_selectables (jack_nframes_t start, jack_nframes_t end, list<Selectable* >&);
 	void get_inverted_selectables (Selection&, list<Selectable* >& results);
-	GdkColor get_region_color () const { return region_color; }
+	Gdk::Color get_region_color () const { return region_color; }
 
 	void foreach_regionview (sigc::slot<void,AudioRegionView*> slot);
 	void foreach_crossfadeview (void (CrossfadeView::*pmf)(void));
@@ -110,8 +111,8 @@ class StreamView : public sigc::trackable
   private:
 	AudioTimeAxisView& _trackview;
 
-	GnomeCanvasItem* canvas_group;
-	GnomeCanvasItem* 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;
@@ -161,7 +162,7 @@ class StreamView : public sigc::trackable
 
 	/* XXX why are these different? */
 	
-	GdkColor region_color;
+	Gdk::Color region_color;
 	uint32_t stream_base_color;
 
 	vector<sigc::connection> playlist_connections;