X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fmarker.h;h=b3a85294ea20e4cf56a4e5223ca1d9d36561d2c8;hb=e36f74e071d4c14862d23da5ff0d49df0940d536;hp=6bf6d08f5132a6bb697ff36bbf4bba073e51fb18;hpb=83f385d26336f58c1b2e3ce49c609fe86878b56d;p=ardour.git

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index 6bf6d08f51..b3a85294ea 100644
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -23,13 +23,13 @@
 #include <string>
 #include <glib.h>
 
-#include <libgnomecanvasmm/pixbuf.h>
 #include <sigc++/signal.h>
 
 #include "ardour/ardour.h"
 #include "pbd/signals.h"
 
-#include "canvas.h"
+#include "canvas/fwd.h"
+#include "canvas/types.h"
 
 namespace ARDOUR {
 	class TempoSection;
@@ -101,11 +101,11 @@ class Marker : public sigc::trackable
 	ArdourCanvas::Group* _parent;
 	ArdourCanvas::Group *group;
 	ArdourCanvas::Polygon *mark;
-	ArdourCanvas::Pixbuf *name_pixbuf;
+        ArdourCanvas::Text *_name_item;
 	ArdourCanvas::Points *points;
-	ArdourCanvas::SimpleLine* _line;
-	ArdourCanvas::Points *line_points;
-	ArdourCanvas::SimpleRect* _name_background;
+	ArdourCanvas::Line* _time_bars_line;
+	ArdourCanvas::Line* _track_canvas_line;
+	ArdourCanvas::Rectangle* _name_background;
 
 	std::string  _name;
 	double        unit_position;