X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.h;h=becc809a742c4114ac98cd9f9c0b897951b608de;hb=d5f55246cc9d1922bfdaf144aaad083f20e49064;hp=ea018565655a352dce16e4b7bb2e7f0bc7b0ab47;hpb=92bd44e01266254015a712bc61a2cef6c7ae84ca;p=ardour.git

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index ea01856565..becc809a74 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;
@@ -38,7 +38,11 @@ namespace ARDOUR {
 
 class PublicEditor;
 
-class Marker : public sigc::trackable
+/** Location Marker
+ *
+ * Editor ruler representation of a location marker or range on the timeline.
+ */
+class ArdourMarker : public sigc::trackable
 {
   public:
 	enum Type {
@@ -56,12 +60,14 @@ class Marker : public sigc::trackable
 	};
 
 
-	Marker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, Type,
+	ArdourMarker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, Type,
 		framepos_t frame = 0, bool handle_events = true);
 
-	virtual ~Marker ();
+	virtual ~ArdourMarker ();
 
-	static PBD::Signal1<void,Marker*> CatchDeletion;
+	static PBD::Signal1<void,ArdourMarker*> CatchDeletion;
+
+	static void setup_sizes (const double timebar_height);
 
 	ArdourCanvas::Item& the_item() const;
 
@@ -76,8 +82,8 @@ class Marker : public sigc::trackable
 
 	framepos_t position() const { return frame_position; }
 
-	ArdourCanvas::Group * get_parent() { return _parent; }
-	void reparent (ArdourCanvas::Group & parent);
+	ArdourCanvas::Container * get_parent() { return _parent; }
+	void reparent (ArdourCanvas::Container & parent);
 
 	void hide ();
 	void show ();
@@ -92,20 +98,19 @@ 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::Container* _parent;
+	ArdourCanvas::Container *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* _track_canvas_line;
+	ArdourCanvas::Rectangle* _name_background;
 
 	std::string  _name;
 	double        unit_position;
@@ -125,24 +130,30 @@ class Marker : public sigc::trackable
 	void reposition ();
 	void setup_line_x ();
 	void setup_name_display ();
+
+private:
+	/* disallow copy construction */
+	ArdourMarker (ArdourMarker const &);
+	ArdourMarker & operator= (ArdourMarker const &);
 };
 
-class TempoMarker : public Marker
+class TempoMarker : public ArdourMarker
 {
   public:
-        TempoMarker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
+        TempoMarker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
 	~TempoMarker ();
 
 	ARDOUR::TempoSection& tempo() const { return _tempo; }
 
+	void update_height_mark (const double& ratio);
   private:
 	ARDOUR::TempoSection& _tempo;
 };
 
-class MeterMarker : public Marker
+class MeterMarker : public ArdourMarker
 {
   public:
-        MeterMarker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
+        MeterMarker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
 	~MeterMarker ();
 
 	ARDOUR::MeterSection& meter() const { return _meter; }