X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fghostregion.cc;h=2cd26014061273df3b7ecae0f3b85d602db6847a;hb=ee873ee8969fa9d0d3da24923c2b690ff7fa0460;hp=f6a081ca35855914cd72c83c04cbc9f3d94ef055;hpb=183f69970c6c436b102f8b2fbe1bc6070c9e9bfe;p=ardour.git

diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc
index f6a081ca35..2cd2601406 100644
--- a/gtk2_ardour/ghostregion.cc
+++ b/gtk2_ardour/ghostregion.cc
@@ -1,9 +1,11 @@
-#include "canvas-simplerect.h"
+#include "simplerect.h"
+#include "waveview.h"
 #include "ghostregion.h"
 #include "automation_time_axis.h"
 #include "rgb_macros.h"
 
 using namespace Editing;
+using namespace ArdourCanvas;
 
 GhostRegion::GhostRegion (AutomationTimeAxisView& atv, double initial_pos)
 	: trackview (atv)
@@ -13,17 +15,17 @@ GhostRegion::GhostRegion (AutomationTimeAxisView& atv, double initial_pos)
   //			     "x", initial_pos,
   //			     "y", 0.0,
   //			     NULL);
-	group = new Gnome::Canvas::Group (*trackview.canvas_display);
-	group->set_property ("x", initial_pos);
-	group->set_property ("y", 0.0);
+	group = new ArdourCanvas::Group (*trackview.canvas_display);
+	group->property_x() = initial_pos;
+	group->property_y() = 0.0;
 
-	base_rect = new Gnome::Canvas::SimpleRect (*group);
-	base_rect->set_property ("x1", (double) 0.0);
-	base_rect->set_property ("y1", (double) 0.0);
-	base_rect->set_property ("y2", (double) trackview.height);
-	base_rect->set_property ("outline_what", (guint32) 0);
-	base_rect->set_property ("outline_color_rgba", color_map[cGhostTrackBaseOutline]);
-	base_rect->set_property ("fill_color_rgba", color_map[cGhostTrackBaseFill]);
+	base_rect = new ArdourCanvas::SimpleRect (*group);
+	base_rect->property_x1() = (double) 0.0;
+	base_rect->property_y1() = (double) 0.0;
+	base_rect->property_y2() = (double) trackview.height;
+	base_rect->property_outline_what() = (guint32) 0;
+	base_rect->property_outline_color_rgba() = color_map[cGhostTrackBaseOutline];
+	base_rect->property_fill_color_rgba() = color_map[cGhostTrackBaseFill];
 	group->lower_to_bottom ();
 
 	atv.add_ghost (this);
@@ -32,36 +34,38 @@ GhostRegion::GhostRegion (AutomationTimeAxisView& atv, double initial_pos)
 GhostRegion::~GhostRegion ()
 {
 	GoingAway (this);
-	gtk_object_destroy (GTK_OBJECT(group));
+	delete base_rect;
+	delete group;
 }
 
 void
 GhostRegion::set_samples_per_unit (double spu)
 {
-	for (vector<GnomeCanvasItem*>::iterator i = waves.begin(); i != waves.end(); ++i) {
-	        gnome_canvas_item_set ((*i), "samples_per_unit", spu, NULL);
+	for (vector<WaveView*>::iterator i = waves.begin(); i != waves.end(); ++i) {
+		(*i)->property_samples_per_unit() = spu;
 	}		
 }
 
 void
 GhostRegion::set_duration (double units)
 {
-        base_rect->set_property ("x2", units);
+        base_rect->property_x2() = units;
 }
 
 void
 GhostRegion::set_height ()
 {
 	gdouble ht;
-	vector<GnomeCanvasItem*>::iterator i;
+	vector<WaveView*>::iterator i;
 	uint32_t n;
 
-	base_rect->set_property ("y2", (double) trackview.height);
+	base_rect->property_y2() = (double) trackview.height;
 	ht = ((trackview.height) / (double) waves.size());
 	
 	for (n = 0, i = waves.begin(); i != waves.end(); ++i, ++n) {
 		gdouble yoff = n * ht;
-		gnome_canvas_item_set ((*i), "height", ht, "y", yoff, NULL);
+		(*i)->property_height() = ht;
+		(*i)->property_y() = yoff;
 	}
 }