X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmarker.h;h=b769f8d1100fb630dc15319b3998cf7a1de6f892;hb=4f5ca7ecb5b7230f54e123339f7bc05e752bbc96;hp=3a3339d31881370d33a90495a2f590a37b6e5a22;hpb=ad017365f7a73f8ba57f667cc1aa36478b48c50e;p=ardour.git

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index 3a3339d318..b769f8d110 100644
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -38,7 +38,7 @@ namespace ARDOUR {
 
 class PublicEditor;
 
-class Marker : public sigc::trackable
+class ArdourMarker : public sigc::trackable
 {
   public:
 	enum Type {
@@ -56,12 +56,14 @@ class Marker : public sigc::trackable
 	};
 
 
-	Marker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, Type,
+	ArdourMarker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, Type,
 		framepos_t frame = 0, bool handle_events = true);
 
-	virtual ~Marker ();
+	virtual ~ArdourMarker ();
 
-	static PBD::Signal1<void,Marker*> CatchDeletion;
+	static PBD::Signal1<void,ArdourMarker*> CatchDeletion;
+
+	static void setup_sizes (const double timebar_height);
 
 	ArdourCanvas::Item& the_item() const;
 
@@ -127,11 +129,11 @@ class Marker : public sigc::trackable
 
 private:
 	/* disallow copy construction */
-	Marker (Marker const &);
-	Marker & operator= (Marker const &);
+	ArdourMarker (ArdourMarker const &);
+	ArdourMarker & operator= (ArdourMarker const &);
 };
 
-class TempoMarker : public Marker
+class TempoMarker : public ArdourMarker
 {
   public:
         TempoMarker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
@@ -143,7 +145,7 @@ class TempoMarker : public Marker
 	ARDOUR::TempoSection& _tempo;
 };
 
-class MeterMarker : public Marker
+class MeterMarker : public ArdourMarker
 {
   public:
         MeterMarker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);