Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.

git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 6 insertions, 1 deletions

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index 5ffd6c5dd1..fa252571fb 100644
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -60,6 +60,7 @@ class Marker : public PBD::Destructible
 	void add_line (ArdourCanvas::Group*, double initial_height);
 	void show_line ();
 	void hide_line ();
+	void set_line_length (double);
 
 	void set_position (nframes_t);
 	void set_name (const string&);
@@ -67,14 +68,18 @@ class Marker : public PBD::Destructible
 	
 	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;
 
+	ArdourCanvas::Group * _parent;
 	ArdourCanvas::Group *group;
 	ArdourCanvas::Polygon *mark;
 	ArdourCanvas::Text *text;