canvas markers now use ArdourCanvas::Text, not ArdourCanvas::Pixbuf, since the latter will be optimized to use Pixbuf too

1 files changed, 3 insertions, 10 deletions

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index 02ef3dc478..62793264ae 100644
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -27,6 +27,8 @@
 
 #include "ardour/ardour.h"
 #include "pbd/signals.h"
+
+#include "canvas/fwd.h"
 #include "canvas/types.h"
 
 namespace ARDOUR {
@@ -34,15 +36,6 @@ namespace ARDOUR {
 	class MeterSection;
 }
 
-namespace ArdourCanvas {
-	class Polygon;
-	class Line;
-	class Rectangle;
-	class Group;
-	class Pixbuf;
-	class Item;
-}
-
 class PublicEditor;
 
 class Marker : public sigc::trackable
@@ -108,7 +101,7 @@ 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::Line* _line;
 	ArdourCanvas::Points *line_points;