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 a99efc81c29f5299a6bd40530f26d79ea1ab2789..443a3646b7c7fcb6400447a79117ab945929f27f 100644 (file)
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -44,7 +44,7 @@ class PublicEditor;
  */
 class ArdourMarker : public sigc::trackable
 {
-  public:
+public:
        enum Type {
                Mark,
                Tempo,
@@ -61,7 +61,7 @@ class ArdourMarker : public sigc::trackable
 
 
        ArdourMarker (PublicEditor& editor, ArdourCanvas::Container &, guint32 rgba, const std::string& text, Type,
-               framepos_t frame = 0, bool handle_events = true);
+                     samplepos_t sample = 0, bool handle_events = true);
 
        virtual ~ArdourMarker ();
 
@@ -75,13 +75,13 @@ class ArdourMarker : 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::Container * get_parent() { return _parent; }
        void reparent (ArdourCanvas::Container & parent);
@@ -100,7 +100,7 @@ class ArdourMarker : public sigc::trackable
 
        bool label_on_left () const;
 
-  protected:
+protected:
        PublicEditor& editor;
 
        Pango::FontDescription name_font;
@@ -115,7 +115,7 @@ class ArdourMarker : public sigc::trackable
 
        std::string  _name;
        double        unit_position;
-       framepos_t    frame_position;
+       samplepos_t    sample_position;
        double       _shift;
        Type         _type;
        int           name_height;