X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fmarker.h;h=e9ff0501edc1fdc28ac908953d284355f8135978;hb=b092cfc21638e4b89164f36ed708136c6cf9c8e0;hp=bcf4357f19fc947c04142bebf2cfaf3809dcac0c;hpb=54a80321064aa543023cd0b224ba9d433520983f;p=ardour.git

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index bcf4357f19..e9ff0501ed 100644
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001 Paul Davis 
+    Copyright (C) 2001 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __gtk_ardour_marker_h__
@@ -23,12 +22,13 @@
 
 #include <string>
 #include <glib.h>
-#include <ardour/ardour.h>
-#include <libgnomecanvasmm/group.h>
-#include <libgnomecanvasmm/text.h>
-#include <libgnomecanvasmm/polygon.h>
+
+#include <libgnomecanvasmm/pixbuf.h>
 #include <sigc++/signal.h>
 
+#include "ardour/ardour.h"
+#include "pbd/signals.h"
+
 #include "canvas.h"
 
 namespace ARDOUR {
@@ -45,48 +45,69 @@ class Marker : public sigc::trackable
 		Mark,
 		Tempo,
 		Meter,
-		Start,
-		End,
+		Start, ///< session start
+		End,   ///< session end
 		LoopStart,
 		LoopEnd,
 		PunchIn,
 		PunchOut
 	};
 
-	Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, Type, 
-		gint (*callback)(ArdourCanvas::Item *, GdkEvent *, gpointer), jack_nframes_t frame = 0);
+
+	Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, Type,
+		nframes_t frame = 0, bool handle_events = true);
+
 	virtual ~Marker ();
 
-	void set_position (jack_nframes_t);
-	void set_name (const string&);
+	static PBD::Signal1<void,Marker*> CatchDeletion;
+
+	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_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::Item *mark;
-	ArdourCanvas::Text *text;
+	ArdourCanvas::Polygon *mark;
+	ArdourCanvas::Pixbuf *name_pixbuf;
 	ArdourCanvas::Points *points;
+	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;
 
-	double    unit_position;
-	jack_nframes_t frame_position;
-	unsigned char      shift; /* should be double, but its always small and integral */
-	Type      _type;
-	
 	void reposition ();
 };
 
 class TempoMarker : public Marker
 {
   public:
-        TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::TempoSection&, 
-		     gint (*callback)(ArdourCanvas::Item *, GdkEvent *, gpointer));
+        TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
 	~TempoMarker ();
 
 	ARDOUR::TempoSection& tempo() const { return _tempo; }
@@ -98,8 +119,7 @@ class TempoMarker : public Marker
 class MeterMarker : public Marker
 {
   public:
-        MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::MeterSection&, 
-		     gint (*callback)(ArdourCanvas::Item *, GdkEvent *, gpointer));
+        MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
 	~MeterMarker ();
 
 	ARDOUR::MeterSection& meter() const { return _meter; }