X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.h;h=a379f010c96a9c34e3ff941d620db16e39c9be92;hb=2d81a5636dcf5532769a1bf4ddaafb2fa91b990a;hp=7865004d54e15de0a509f1fad2b397014e07ee8f;hpb=99904735e066804358f1d0bd138a84f1e9ecda91;p=ardour.git

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index 7865004d54..a379f010c9 100644
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -22,8 +22,11 @@
 
 #include <string>
 #include <glib.h>
-#include <ardour/ardour.h>
-#include <sigc++/signal.h>
+
+#include <libgnomecanvasmm/pixbuf.h>
+
+#include "ardour/ardour.h"
+#include "pbd/destructible.h"
 
 #include "canvas.h"
 
@@ -34,7 +37,7 @@ namespace ARDOUR {
 
 class PublicEditor;
 
-class Marker : public sigc::trackable
+class Marker : public PBD::Destructible
 {
   public:
 	enum Type {
@@ -50,34 +53,50 @@ class Marker : public sigc::trackable
 	};
 
 
-	Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, Type, 
+	Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, Type, 
 		nframes_t frame = 0, bool handle_events = true);
 
 	virtual ~Marker ();
 
 	ArdourCanvas::Item& the_item() const;
 
-	void set_position (nframes_t);
-	void set_name (const string&);
+	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_position (nframes64_t);
+	void set_name (const std::string&);
 	void set_color_rgba (uint32_t rgba);
+	
+	nframes64_t position() const { return frame_position; }
 
+	ArdourCanvas::Group * get_parent() { return _parent; }
+	void reparent (ArdourCanvas::Group & parent);
+	
 	void hide ();
 	void show ();
 
 	Type type () { return _type; }
-	
+
   protected:
 	PublicEditor& editor;
 
+	Pango::FontDescription* name_font;
+
+	ArdourCanvas::Group * _parent;
 	ArdourCanvas::Group *group;
 	ArdourCanvas::Polygon *mark;
-	ArdourCanvas::Text *text;
+	ArdourCanvas::Pixbuf *name_pixbuf;
 	ArdourCanvas::Points *points;
-
-	double    unit_position;
-	nframes_t frame_position;
-	unsigned char      shift; /* should be double, but its always small and integral */
-	Type      _type;
+	ArdourCanvas::SimpleLine *line;
+	ArdourCanvas::Points *line_points;
+
+	double        unit_position;
+	nframes64_t   frame_position;
+	unsigned char shift; /* should be double, but its always small and integral */
+	Type          _type;
+	int           name_height;
 	
 	void reposition ();
 };
@@ -85,7 +104,7 @@ class Marker : public sigc::trackable
 class TempoMarker : public Marker
 {
   public:
-        TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::TempoSection&);
+        TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
 	~TempoMarker ();
 
 	ARDOUR::TempoSection& tempo() const { return _tempo; }
@@ -97,7 +116,7 @@ class TempoMarker : public Marker
 class MeterMarker : public Marker
 {
   public:
-        MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::MeterSection&);
+        MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
 	~MeterMarker ();
 
 	ARDOUR::MeterSection& meter() const { return _meter; }