notably modify the design and logic of the startup dialog, so that we can handle...

[ardour.git] / gtk2_ardour / marker.h

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index 65952899016f498fba9eb3859a147c611d6f482b..6bf6d08f5132a6bb697ff36bbf4bba073e51fb18 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
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __gtk_ardour_marker_h__
@@ -23,11 +22,15 @@
 
 #include <string>
 #include <glib.h>
-#include <ardour/ardour.h>
-#include <libgnomecanvasmm/libgnomecanvasmm.h>
-#include <libgnomecanvasmm/polygon.h>
+
+#include <libgnomecanvasmm/pixbuf.h>
 #include <sigc++/signal.h>
 
+#include "ardour/ardour.h"
+#include "pbd/signals.h"
+
+#include "canvas.h"
+
 namespace ARDOUR {
        class TempoSection;
        class MeterSection;
@@ -42,48 +45,97 @@ class Marker : public sigc::trackable
                Mark,
                Tempo,
                Meter,
-               Start,
-               End,
+               SessionStart, ///< session start
+               SessionEnd,   ///< session end
+               RangeStart,
+               RangeEnd,
                LoopStart,
                LoopEnd,
                PunchIn,
                PunchOut
        };
 
-       Marker (PublicEditor& editor, Gnome::Canvas::Group& parent, guint32 rgba, const string& text, Type, 
-               gint (*callback)(Gnome::Canvas::Item *, GdkEvent *, gpointer), jack_nframes_t frame = 0);
+
+       Marker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, Type,
+               framepos_t frame = 0, bool handle_events = true);
+
        virtual ~Marker ();
 
-       void set_position (jack_nframes_t);
-       void set_name (const string&);
+       static PBD::Signal1<void,Marker*> CatchDeletion;
+
+       ArdourCanvas::Item& the_item() const;
+
+       void set_selected (bool);
+       void set_show_line (bool);
+       void canvas_height_set (double);
+
+       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; }
+
+       ArdourCanvas::Group * get_parent() { return _parent; }
+       void reparent (ArdourCanvas::Group & parent);
 
        void hide ();
        void show ();
 
        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;
 
-       Gnome::Canvas::Group *group;
-       Gnome::Canvas::Item *mark;
-       Gnome::Canvas::Text *text;
-       Gnome::Canvas::Points *points;
+       Pango::FontDescription name_font;
+
+       ArdourCanvas::Group* _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;
+       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;
 
-       double    unit_position;
-       jack_nframes_t frame_position;
-       unsigned char      shift; /* should be double, but its always small and integral */
-       Type      _type;
-       
        void reposition ();
+       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, Gnome::Canvas::Group& parent, guint32 rgba, const string& text, ARDOUR::TempoSection&, 
-                    gint (*callback)(Gnome::Canvas::Item *, GdkEvent *, gpointer));
+        TempoMarker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
        ~TempoMarker ();
 
        ARDOUR::TempoSection& tempo() const { return _tempo; }
@@ -95,8 +147,7 @@ class TempoMarker : public Marker
 class MeterMarker : public Marker
 {
   public:
-        MeterMarker (PublicEditor& editor, Gnome::Canvas::Group& parent, guint32 rgba, const string& text, ARDOUR::MeterSection&, 
-                    gint (*callback)(Gnome::Canvas::Item *, GdkEvent *, gpointer));
+        MeterMarker (PublicEditor& editor, ArdourCanvas::Group &, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
        ~MeterMarker ();
 
        ARDOUR::MeterSection& meter() const { return _meter; }