X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.h;h=443a3646b7c7fcb6400447a79117ab945929f27f;hb=9ccc56e162554c292b25408246e3680b8f14eea7;hp=02ef3dc478b756e3d9de7119e077e5b7f50b943c;hpb=aaea166135ace01709f7e0be64f40be80f4107ec;p=ardour.git

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index 02ef3dc478..443a3646b7 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,20 +36,15 @@ 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
+/** Location Marker
+ *
+ * Editor ruler representation of a location marker or range on the timeline.
+ */
+class ArdourMarker : public sigc::trackable
 {
-  public:
+public:
 	enum Type {
 		Mark,
 		Tempo,
@@ -63,12 +60,14 @@ class Marker : public sigc::trackable
 	};
 
 
-	Marker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, Type,
-		framepos_t frame = 0, bool handle_events = true);
+	ArdourMarker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, Type,
+	              samplepos_t sample = 0, bool handle_events = true);
+
+	virtual ~ArdourMarker ();
 
-	virtual ~Marker ();
+	static PBD::Signal1<void,ArdourMarker*> CatchDeletion;
 
-	static PBD::Signal1<void,Marker*> CatchDeletion;
+	static void setup_sizes (const double timebar_height);
 
 	ArdourCanvas::Item& the_item() const;
 
@@ -76,15 +75,16 @@ class Marker : public sigc::trackable
 	void set_show_line (bool);
 	void canvas_height_set (double);
 
-	void set_position (framepos_t);
+	void set_position (samplepos_t);
 	void set_name (const std::string&);
+	void set_points_color (uint32_t rgba);
 	void set_color_rgba (uint32_t rgba);
 	void setup_line ();
 
-	framepos_t position() const { return frame_position; }
+	samplepos_t position() const { return sample_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 ();
@@ -100,23 +100,22 @@ class Marker : public sigc::trackable
 
 	bool label_on_left () const;
 
-  protected:
+protected:
 	PublicEditor& editor;
 
 	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::Line* _line;
-	ArdourCanvas::Points *line_points;
+	ArdourCanvas::Line* _track_canvas_line;
 	ArdourCanvas::Rectangle* _name_background;
 
 	std::string  _name;
 	double        unit_position;
-	framepos_t    frame_position;
+	samplepos_t    sample_position;
 	double       _shift;
 	Type         _type;
 	int           name_height;
@@ -125,6 +124,7 @@ class Marker : public sigc::trackable
 	bool         _line_shown;
 	double       _canvas_height;
 	uint32_t     _color;
+	uint32_t     _points_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;
@@ -135,26 +135,27 @@ class Marker : public sigc::trackable
 
 private:
 	/* disallow copy construction */
-	Marker (Marker const &);
-	Marker & operator= (Marker const &);
+	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; }