X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.h;h=3a3339d31881370d33a90495a2f590a37b6e5a22;hb=5fef65538040fbac1b9edd1847a269aa925a49c9;hp=62793264aec4dcca7841033bd501e1a7440cc1ac;hpb=fc787fad50596e15a2f487c8cf3cae164f760791;p=ardour.git

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index 62793264ae..3a3339d318 100644
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -56,7 +56,7 @@ class Marker : public sigc::trackable
 	};
 
 
-	Marker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, Type,
+	Marker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, Type,
 		framepos_t frame = 0, bool handle_events = true);
 
 	virtual ~Marker ();
@@ -76,8 +76,8 @@ class Marker : public sigc::trackable
 
 	framepos_t position() const { return frame_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 ();
@@ -98,13 +98,12 @@ class Marker : public sigc::trackable
 
 	Pango::FontDescription name_font;
 
-	ArdourCanvas::Group* _parent;
-	ArdourCanvas::Group *group;
+	ArdourCanvas::Container* _parent;
+	ArdourCanvas::Container *group;
 	ArdourCanvas::Polygon *mark;
         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;
@@ -135,7 +134,7 @@ private:
 class TempoMarker : public Marker
 {
   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; }
@@ -147,7 +146,7 @@ class TempoMarker : public Marker
 class MeterMarker : public Marker
 {
   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; }