Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / marker.h

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index aa4888fe20e8f3d8dcd6501aeb67c578daa379f4..b3a85294ea20e4cf56a4e5223ca1d9d36561d2c8 100644 (file)
--- 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;
@@ -92,20 +92,20 @@ class Marker : public sigc::trackable
        }
 
        bool label_on_left () const;
-       
+
   protected:
        PublicEditor& editor;
 
-       Pango::FontDescription* name_font;
+       Pango::FontDescription name_font;
 
        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;