remove UUIDs as implemention of PBD::ID, use static counter (not finished - counter...

[ardour.git] / gtk2_ardour / ghostregion.h

diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index 0abb1b9b914067360c4f471e25b3966f12d59ef0..0255035ea1504f65e290f6c3720f3842d46ee402 100644 (file)
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -22,17 +22,19 @@
 #define __ardour_gtk_ghost_region_h__
 
 #include <vector>
-#include <sigc++/signal_system.h>
-#include <gtk-canvas.h>
+#include <sigc++/signal.h>
+#include <libgnomecanvasmm.h>
+#include "canvas.h"
+#include "simplerect.h"
 
 class AutomationTimeAxisView;
 
-struct GhostRegion : public SigC::Object
+struct GhostRegion : public sigc::trackable
 {
     AutomationTimeAxisView& trackview;
-    GtkCanvasItem* group;
-    GtkCanvasItem* base_rect;
-    std::vector<GtkCanvasItem*> waves;
+    ArdourCanvas::Group* group;
+    ArdourCanvas::SimpleRect* base_rect;
+    std::vector<ArdourCanvas::WaveView*> waves;
 
     GhostRegion (AutomationTimeAxisView& tv, double initial_unit_pos);
     ~GhostRegion ();
@@ -41,7 +43,7 @@ struct GhostRegion : public SigC::Object
     void set_duration (double units);
     void set_height ();
 
-    SigC::Signal1<void,GhostRegion*> GoingAway;
+    sigc::signal<void,GhostRegion*> GoingAway;
 };
 
 #endif /* __ardour_gtk_ghost_region_h__ */