fix merge errors with master

[ardour.git] / gtk2_ardour / marker.h

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index 02ef3dc478b756e3d9de7119e077e5b7f50b943c..b3a85294ea20e4cf56a4e5223ca1d9d36561d2c8 100644 (file)
--- 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,10 +101,10 @@ 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;
+       ArdourCanvas::Line* _time_bars_line;
+       ArdourCanvas::Line* _track_canvas_line;
        ArdourCanvas::Rectangle* _name_background;
 
        std::string  _name;