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

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index 7865004d54..18eea0963e 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
@@ -22,9 +22,13 @@
 
 #include <string>
 #include <glib.h>
-#include <ardour/ardour.h>
+
+#include <libgnomecanvasmm/pixbuf.h>
 #include <sigc++/signal.h>
 
+#include "ardour/ardour.h"
+#include "pbd/signals.h"
+
 #include "canvas.h"
 
 namespace ARDOUR {
@@ -41,8 +45,10 @@ class Marker : public sigc::trackable
 		Mark,
 		Tempo,
 		Meter,
-		Start,
-		End,
+		SessionStart, ///< session start
+		SessionEnd,   ///< session end
+		RangeStart,
+		RangeEnd,
 		LoopStart,
 		LoopEnd,
 		PunchIn,
@@ -50,42 +56,67 @@ class Marker : public sigc::trackable
 	};
 
 
-	Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, Type, 
+	Marker (PublicEditor& editor, ArdourCanvas::Group &, ArdourCanvas::Group &, guint32 rgba, const std::string& text, Type,
 		nframes_t frame = 0, bool handle_events = true);
 
 	virtual ~Marker ();
 
+	static PBD::Signal1<void,Marker*> CatchDeletion;
+
 	ArdourCanvas::Item& the_item() const;
 
-	void set_position (nframes_t);
-	void set_name (const string&);
+	void set_selected (bool);
+	void set_show_line (bool);
+	void canvas_height_set (double);
+
+	void set_position (framepos_t);
+	void set_name (const std::string&);
 	void set_color_rgba (uint32_t rgba);
+	void setup_line ();
+
+	framepos_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* _line_parent;
 	ArdourCanvas::Group *group;
 	ArdourCanvas::Polygon *mark;
-	ArdourCanvas::Text *text;
+	ArdourCanvas::Pixbuf *name_pixbuf;
 	ArdourCanvas::Points *points;
+	ArdourCanvas::SimpleLine* _line;
+	ArdourCanvas::Points *line_points;
+
+	double        unit_position;
+	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    unit_position;
-	nframes_t frame_position;
-	unsigned char      shift; /* should be double, but its always small and integral */
-	Type      _type;
-	
 	void reposition ();
+	void setup_line_x ();
 };
 
 class TempoMarker : public Marker
 {
   public:
-        TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::TempoSection&);
+        TempoMarker (PublicEditor& editor, ArdourCanvas::Group &, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
 	~TempoMarker ();
 
 	ARDOUR::TempoSection& tempo() const { return _tempo; }
@@ -97,7 +128,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 &, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
 	~MeterMarker ();
 
 	ARDOUR::MeterSection& meter() const { return _meter; }