Make activate/deactivate all only operate on visible

[ardour.git] / gtk2_ardour / marker.h

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index e5885e66115b6763505e6aff64813d903f58052d..6bf6d08f5132a6bb697ff36bbf4bba073e51fb18 100644 (file)
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -45,8 +45,10 @@ class Marker : public sigc::trackable
                Mark,
                Tempo,
                Meter,
-               Start, ///< session start
-               End,   ///< session end
+               SessionStart, ///< session start
+               SessionEnd,   ///< session end
+               RangeStart,
+               RangeEnd,
                LoopStart,
                LoopEnd,
                PunchIn,
@@ -54,8 +56,8 @@ class Marker : public sigc::trackable
        };
 
 
-       Marker (PublicEditor& editor, ArdourCanvas::Group &, ArdourCanvas::Group &, guint32 rgba, const std::string& text, Type,
-               nframes_t frame = 0, bool handle_events = true);
+       Marker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, Type,
+               framepos_t frame = 0, bool handle_events = true);
 
        virtual ~Marker ();
 
@@ -70,6 +72,7 @@ class Marker : public sigc::trackable
        void set_position (framepos_t);
        void set_name (const std::string&);
        void set_color_rgba (uint32_t rgba);
+       void setup_line ();
 
        framepos_t position() const { return frame_position; }
 
@@ -81,38 +84,58 @@ class Marker : public sigc::trackable
 
        Type type () { return _type; }
 
+       void set_left_label_limit (double);
+       void set_right_label_limit (double);
+
+       std::string name () const {
+               return _name;
+       }
+
+       bool label_on_left () const;
+
   protected:
        PublicEditor& editor;
 
-       Pango::FontDescription* name_font;
+       Pango::FontDescription name_font;
 
        ArdourCanvas::Group* _parent;
-       ArdourCanvas::Group* _line_parent;
        ArdourCanvas::Group *group;
        ArdourCanvas::Polygon *mark;
        ArdourCanvas::Pixbuf *name_pixbuf;
        ArdourCanvas::Points *points;
        ArdourCanvas::SimpleLine* _line;
        ArdourCanvas::Points *line_points;
+       ArdourCanvas::SimpleRect* _name_background;
 
+       std::string  _name;
        double        unit_position;
        framepos_t    frame_position;
-       unsigned char shift; /* should be double, but its always small and integral */
+       double       _shift;
        Type         _type;
        int           name_height;
        bool         _selected;
        bool         _shown;
+       bool         _line_shown;
        double       _canvas_height;
        uint32_t     _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;
 
        void reposition ();
-       void setup_line ();
+       void setup_line_x ();
+       void setup_name_display ();
+
+private:
+       /* disallow copy construction */
+       Marker (Marker const &);
+       Marker & operator= (Marker const &);
 };
 
 class TempoMarker : public Marker
 {
   public:
-        TempoMarker (PublicEditor& editor, ArdourCanvas::Group &, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
+        TempoMarker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
        ~TempoMarker ();
 
        ARDOUR::TempoSection& tempo() const { return _tempo; }
@@ -124,7 +147,7 @@ class TempoMarker : public Marker
 class MeterMarker : public Marker
 {
   public:
-        MeterMarker (PublicEditor& editor, ArdourCanvas::Group &, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
+        MeterMarker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
        ~MeterMarker ();
 
        ARDOUR::MeterSection& meter() const { return _meter; }