X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.h;h=b3a85294ea20e4cf56a4e5223ca1d9d36561d2c8;hb=61c199b97c3eb4bbd84d2d033594be682944a416;hp=efe2c8ee78b8d89ad7e234dc97fa8fde77252886;hpb=8496f57fd49f1fd74d2c8662a91088374fb662ba;p=ardour.git

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index efe2c8ee78..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;
@@ -56,8 +56,8 @@ class Marker : public sigc::trackable
 	};
 
 
-	Marker (PublicEditor& editor, ArdourCanvas::Group &, ArdourCanvas::Group &, guint32 rgba, const std::string& text, Type,
-		nframes_t frame = 0, bool handle_events = true);
+	Marker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, Type,
+		framepos_t frame = 0, bool handle_events = true);
 
 	virtual ~Marker ();
 
@@ -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* _line_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::Line* _time_bars_line;
+	ArdourCanvas::Line* _track_canvas_line;
+	ArdourCanvas::Rectangle* _name_background;
 
 	std::string  _name;
 	double        unit_position;
@@ -120,16 +120,22 @@ class Marker : public sigc::trackable
 	uint32_t     _color;
 	double       _left_label_limit; ///< the number of pixels available to the left of this marker for a label
 	double       _right_label_limit; ///< the number of pixels available to the right of this marker for a label
+	double       _label_offset;
 
 	void reposition ();
 	void setup_line_x ();
-	void setup_name_pixbuf ();
+	void setup_name_display ();
+
+private:
+	/* disallow copy construction */
+	Marker (Marker const &);
+	Marker & operator= (Marker const &);
 };
 
 class TempoMarker : public Marker
 {
   public:
-        TempoMarker (PublicEditor& editor, ArdourCanvas::Group &, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
+        TempoMarker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
 	~TempoMarker ();
 
 	ARDOUR::TempoSection& tempo() const { return _tempo; }
@@ -141,7 +147,7 @@ class TempoMarker : public Marker
 class MeterMarker : public Marker
 {
   public:
-        MeterMarker (PublicEditor& editor, ArdourCanvas::Group &, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
+        MeterMarker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
 	~MeterMarker ();
 
 	ARDOUR::MeterSection& meter() const { return _meter; }