Merged with trunk R1612.

[ardour.git] / gtk2_ardour / ghostregion.h

diff --git a/gtk2_ardour/ghostregion.h b/gtk2_ardour/ghostregion.h
index 120be39e007437faaac46447991dd1d125ca0266..77b22f942c6d3cdd7382a9a87868f2cb131df13c 100644 (file)
--- a/gtk2_ardour/ghostregion.h
+++ b/gtk2_ardour/ghostregion.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_gtk_ghost_region_h__
@@ -23,16 +22,18 @@
 
 #include <vector>
 #include <sigc++/signal.h>
-#include <libgnomecanvas/libgnomecanvas.h>
+#include <libgnomecanvasmm.h>
+#include "canvas.h"
+#include "simplerect.h"
 
 class AutomationTimeAxisView;
 
 struct GhostRegion : public sigc::trackable
 {
     AutomationTimeAxisView& trackview;
-    GnomeCanvasItem* group;
-    GnomeCanvasItem* base_rect;
-    std::vector<GnomeCanvasItem*> waves;
+    ArdourCanvas::Group* group;
+    ArdourCanvas::SimpleRect* base_rect;
+    std::vector<ArdourCanvas::WaveView*> waves;
 
     GhostRegion (AutomationTimeAxisView& tv, double initial_unit_pos);
     ~GhostRegion ();