Fix update of range marker names. Fixes #3533.

[ardour.git] / gtk2_ardour / marker.h

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index fe6cac75c474cd5b57d3053ad1edf5c5657744c0..18eea0963eebbb16a1a1c248220a6a44b00847b9 100644 (file)
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2001 Paul Davis 
+    Copyright (C) 2001 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -24,9 +24,10 @@
 #include <glib.h>
 
 #include <libgnomecanvasmm/pixbuf.h>
+#include <sigc++/signal.h>
 
 #include "ardour/ardour.h"
-#include "pbd/destructible.h"
+#include "pbd/signals.h"
 
 #include "canvas.h"
 
@@ -37,15 +38,17 @@ namespace ARDOUR {
 
 class PublicEditor;
 
-class Marker : public PBD::Destructible
+class Marker : public sigc::trackable
 {
   public:
        enum Type {
                Mark,
                Tempo,
                Meter,
-               Start,
-               End,
+               SessionStart, ///< session start
+               SessionEnd,   ///< session end
+               RangeStart,
+               RangeEnd,
                LoopStart,
                LoopEnd,
                PunchIn,
@@ -53,27 +56,29 @@ class Marker : public PBD::Destructible
        };
 
 
-       Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, Type, 
+       Marker (PublicEditor& editor, ArdourCanvas::Group &, ArdourCanvas::Group &, guint32 rgba, const std::string& text, Type,
                nframes_t frame = 0, bool handle_events = true);
 
        virtual ~Marker ();
 
+       static PBD::Signal1<void,Marker*> CatchDeletion;
+
        ArdourCanvas::Item& the_item() const;
 
-       void add_line (ArdourCanvas::Group*, double y_origin, double initial_height);
-       void show_line ();
-       void hide_line ();
-       void set_line_vpos (double y_origin, double height);
+       void set_selected (bool);
+       void set_show_line (bool);
+       void canvas_height_set (double);
 
-       void set_position (nframes_t);
+       void set_position (framepos_t);
        void set_name (const std::string&);
        void set_color_rgba (uint32_t rgba);
-       
-       nframes64_t position() const { return frame_position; }
+       void setup_line ();
+
+       framepos_t position() const { return frame_position; }
 
        ArdourCanvas::Group * get_parent() { return _parent; }
        void reparent (ArdourCanvas::Group & parent);
-       
+
        void hide ();
        void show ();
 
@@ -84,27 +89,34 @@ class Marker : public PBD::Destructible
 
        Pango::FontDescription* name_font;
 
-       ArdourCanvas::Group * _parent;
+       ArdourCanvas::Group* _parent;
+       ArdourCanvas::Group* _line_parent;
        ArdourCanvas::Group *group;
        ArdourCanvas::Polygon *mark;
        ArdourCanvas::Pixbuf *name_pixbuf;
        ArdourCanvas::Points *points;
-       ArdourCanvas::SimpleLine *line;
+       ArdourCanvas::SimpleLine* _line;
        ArdourCanvas::Points *line_points;
 
        double        unit_position;
-       nframes64_t   frame_position;
-       unsigned char shift; /* should be double, but its always small and integral */
-       Type          _type;
+       framepos_t    frame_position;
+       double       _shift;
+       Type         _type;
        int           name_height;
-       
+       bool         _selected;
+       bool         _shown;
+       bool         _line_shown;
+       double       _canvas_height;
+       uint32_t     _color;
+
        void reposition ();
+       void setup_line_x ();
 };
 
 class TempoMarker : public Marker
 {
   public:
-        TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
+        TempoMarker (PublicEditor& editor, ArdourCanvas::Group &, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
        ~TempoMarker ();
 
        ARDOUR::TempoSection& tempo() const { return _tempo; }
@@ -116,7 +128,7 @@ class TempoMarker : public Marker
 class MeterMarker : public Marker
 {
   public:
-        MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
+        MeterMarker (PublicEditor& editor, ArdourCanvas::Group &, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
        ~MeterMarker ();
 
        ARDOUR::MeterSection& meter() const { return _meter; }