Fixed some valgrind errors from using uninitialized variables in

[ardour.git] / gtk2_ardour / ghostregion.cc

diff --git a/gtk2_ardour/ghostregion.cc b/gtk2_ardour/ghostregion.cc
index 32c25b74cc6483a750d259e101167301703ccb7b..2cd26014061273df3b7ecae0f3b85d602db6847a 100644 (file)
--- a/gtk2_ardour/ghostregion.cc
+++ b/gtk2_ardour/ghostregion.cc
@@ -1,30 +1,32 @@
-#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)
 {
-       group = gnome_canvas_item_new (GNOME_CANVAS_GROUP(trackview.canvas_display),
-                                    gnome_canvas_group_get_type(),
-                                    "x", initial_pos,
-                                    "y", 0.0,
-                                    NULL);
+  //group = gnome_canvas_item_new (GNOME_CANVAS_GROUP(trackview.canvas_display),
+  //                        gnome_canvas_group_get_type(),
+  //                        "x", initial_pos,
+  //                        "y", 0.0,
+  //                        NULL);
+       group = new ArdourCanvas::Group (*trackview.canvas_display);
+       group->property_x() = initial_pos;
+       group->property_y() = 0.0;
 
-       base_rect = gnome_canvas_item_new (GNOME_CANVAS_GROUP(group),
-                                        gnome_canvas_simplerect_get_type(),
-                                        "x1", (double) 0.0,
-                                        "y1", (double) 0.0,
-                                        "y2", (double) trackview.height,
-                                        "outline_what", (guint32) 0,
-                                        "outline_color_rgba", color_map[cGhostTrackBaseOutline],
-                                        "fill_color_rgba", color_map[cGhostTrackBaseFill],
-                                        NULL);
-
-       gnome_canvas_item_lower_to_bottom (group);
+       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,37 +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)
 {
-       gnome_canvas_item_set (base_rect, "x2", units, NULL);
+        base_rect->property_x2() = units;
 }
 
 void
 GhostRegion::set_height ()
 {
        gdouble ht;
-       vector<GnomeCanvasItem*>::iterator i;
+       vector<WaveView*>::iterator i;
        uint32_t n;
 
-       gnome_canvas_item_set (base_rect, "y2", (double) trackview.height, NULL);
-
+       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;
        }
 }