X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.h;h=facaaffb09d9989dfb404143a92a21af62425b23;hb=ff46a3c3a216afc97fee0c796ac2eaa92d58becb;hp=e9ff0501edc1fdc28ac908953d284355f8135978;hpb=895bad1dcd817cb8ad32dc255a90271edd6659fb;p=ardour.git

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index e9ff0501ed..facaaffb09 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;
@@ -45,8 +45,10 @@ class Marker : public sigc::trackable
 		Mark,
 		Tempo,
 		Meter,
-		Start, ///< session start
-		End,   ///< session end
+		SessionStart, ///< session start
+		SessionEnd,   ///< session end
+		RangeStart,
+		RangeEnd,
 		LoopStart,
 		LoopEnd,
 		PunchIn,
@@ -54,8 +56,8 @@ class Marker : public sigc::trackable
 	};
 
 
-	Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, Type,
-		nframes_t frame = 0, bool handle_events = true);
+	Marker (PublicEditor& editor, ArdourCanvas::Layout &, guint32 rgba, const std::string& text, Type,
+		framepos_t frame = 0, bool handle_events = true);
 
 	virtual ~Marker ();
 
@@ -63,51 +65,76 @@ class Marker : public sigc::trackable
 
 	ArdourCanvas::Item& the_item() const;
 
-	void add_line (ArdourCanvas::Group*, double y_origin, double initial_height);
-	void show_line ();
-	void hide_line ();
-	void set_line_vpos (double y_origin, double height);
+	void set_selected (bool);
+	void set_show_line (bool);
+	void canvas_height_set (double);
 
-	void set_position (nframes64_t);
+	void set_position (framepos_t);
 	void set_name (const std::string&);
 	void set_color_rgba (uint32_t rgba);
+	void setup_line ();
 
-	nframes64_t position() const { return frame_position; }
+	framepos_t position() const { return frame_position; }
 
-	ArdourCanvas::Group * get_parent() { return _parent; }
-	void reparent (ArdourCanvas::Group & parent);
+	ArdourCanvas::Layout * get_parent() { return _parent; }
+	void reparent (ArdourCanvas::Layout & parent);
 
 	void hide ();
 	void show ();
 
 	Type type () { return _type; }
 
+	void set_left_label_limit (double);
+	void set_right_label_limit (double);
+
+	std::string name () const {
+		return _name;
+	}
+
+	bool label_on_left () const;
+
   protected:
 	PublicEditor& editor;
 
-	Pango::FontDescription* name_font;
+	Pango::FontDescription name_font;
 
-	ArdourCanvas::Group * _parent;
-	ArdourCanvas::Group *group;
+	ArdourCanvas::Layout* _parent;
+	ArdourCanvas::Layout *group;
 	ArdourCanvas::Polygon *mark;
-	ArdourCanvas::Pixbuf *name_pixbuf;
+        ArdourCanvas::Text *_name_item;
 	ArdourCanvas::Points *points;
-	ArdourCanvas::SimpleLine *line;
-	ArdourCanvas::Points *line_points;
+	ArdourCanvas::Line* _track_canvas_line;
+	ArdourCanvas::Rectangle* _name_background;
 
+	std::string  _name;
 	double        unit_position;
-	nframes64_t   frame_position;
-	unsigned char shift; /* should be double, but its always small and integral */
-	Type          _type;
+	framepos_t    frame_position;
+	double       _shift;
+	Type         _type;
 	int           name_height;
+	bool         _selected;
+	bool         _shown;
+	bool         _line_shown;
+	double       _canvas_height;
+	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_display ();
+
+private:
+	/* disallow copy construction */
+	Marker (Marker const &);
+	Marker & operator= (Marker const &);
 };
 
 class TempoMarker : public Marker
 {
   public:
-        TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
+        TempoMarker (PublicEditor& editor, ArdourCanvas::Layout &, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
 	~TempoMarker ();
 
 	ARDOUR::TempoSection& tempo() const { return _tempo; }
@@ -119,7 +146,7 @@ class TempoMarker : public Marker
 class MeterMarker : public Marker
 {
   public:
-        MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
+        MeterMarker (PublicEditor& editor, ArdourCanvas::Layout &, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
 	~MeterMarker ();
 
 	ARDOUR::MeterSection& meter() const { return _meter; }