replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls

[ardour.git] / gtk2_ardour / marker.h

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index b3a85294ea20e4cf56a4e5223ca1d9d36561d2c8..443a3646b7c7fcb6400447a79117ab945929f27f 100644 (file)
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -38,9 +38,13 @@ namespace ARDOUR {
 
 class PublicEditor;
 
-class Marker : public sigc::trackable
+/** Location Marker
+ *
+ * Editor ruler representation of a location marker or range on the timeline.
+ */
+class ArdourMarker : public sigc::trackable
 {
-  public:
+public:
        enum Type {
                Mark,
                Tempo,
@@ -56,12 +60,14 @@ class Marker : public sigc::trackable
        };
 
 
-       Marker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, Type,
-               framepos_t frame = 0, bool handle_events = true);
+       ArdourMarker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, Type,
+                     samplepos_t sample = 0, bool handle_events = true);
+
+       virtual ~ArdourMarker ();
 
-       virtual ~Marker ();
+       static PBD::Signal1<void,ArdourMarker*> CatchDeletion;
 
-       static PBD::Signal1<void,Marker*> CatchDeletion;
+       static void setup_sizes (const double timebar_height);
 
        ArdourCanvas::Item& the_item() const;
 
@@ -69,15 +75,16 @@ class Marker : public sigc::trackable
        void set_show_line (bool);
        void canvas_height_set (double);
 
-       void set_position (framepos_t);
+       void set_position (samplepos_t);
        void set_name (const std::string&);
+       void set_points_color (uint32_t rgba);
        void set_color_rgba (uint32_t rgba);
        void setup_line ();
 
-       framepos_t position() const { return frame_position; }
+       samplepos_t position() const { return sample_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 ();
@@ -93,23 +100,22 @@ class Marker : public sigc::trackable
 
        bool label_on_left () const;
 
-  protected:
+protected:
        PublicEditor& editor;
 
        Pango::FontDescription name_font;
 
-       ArdourCanvas::Group* _parent;
-       ArdourCanvas::Group *group;
+       ArdourCanvas::Container* _parent;
+       ArdourCanvas::Container *group;
        ArdourCanvas::Polygon *mark;
-        ArdourCanvas::Text *_name_item;
+       ArdourCanvas::Text *_name_item;
        ArdourCanvas::Points *points;
-       ArdourCanvas::Line* _time_bars_line;
        ArdourCanvas::Line* _track_canvas_line;
        ArdourCanvas::Rectangle* _name_background;
 
        std::string  _name;
        double        unit_position;
-       framepos_t    frame_position;
+       samplepos_t    sample_position;
        double       _shift;
        Type         _type;
        int           name_height;
@@ -118,6 +124,7 @@ class Marker : public sigc::trackable
        bool         _line_shown;
        double       _canvas_height;
        uint32_t     _color;
+       uint32_t     _points_color;
        double       _left_label_limit; ///< the number of pixels available to the left of this marker for a label
        double       _right_label_limit; ///< the number of pixels available to the right of this marker for a label
        double       _label_offset;
@@ -128,26 +135,27 @@ 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::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; }
 
+       void update_height_mark (const double ratio);
   private:
        ARDOUR::TempoSection& _tempo;
 };
 
-class MeterMarker : public Marker
+class MeterMarker : public ArdourMarker
 {
   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; }