Use boost::shared_ptr instead of raw pointers for RouteUI track (etc) accessors ...

[ardour.git] / gtk2_ardour / marker.h

diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h
index 01f1404a82ff5f48ea79b4eecf7e434b73d7eaf4..7865004d54e15de0a509f1fad2b397014e07ee8f 100644 (file)
--- a/gtk2_ardour/marker.h
+++ b/gtk2_ardour/marker.h
@@ -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__
@@ -24,8 +23,9 @@
 #include <string>
 #include <glib.h>
 #include <ardour/ardour.h>
-#include <gtk-canvas.h>
-#include <sigc++/signal_system.h>
+#include <sigc++/signal.h>
+
+#include "canvas.h"
 
 namespace ARDOUR {
        class TempoSection;
@@ -34,7 +34,7 @@ namespace ARDOUR {
 
 class PublicEditor;
 
-class Marker : public SigC::Object
+class Marker : public sigc::trackable
 {
   public:
        enum Type {
@@ -49,11 +49,15 @@ class Marker : public SigC::Object
                PunchOut
        };
 
-       Marker (PublicEditor& editor, GtkCanvasGroup *parent, guint32 rgba, const string& text, Type, 
-               gint (*callback)(GtkCanvasItem *, GdkEvent *, gpointer), jack_nframes_t frame = 0);
+
+       Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, Type, 
+               nframes_t frame = 0, bool handle_events = true);
+
        virtual ~Marker ();
 
-       void set_position (jack_nframes_t);
+       ArdourCanvas::Item& the_item() const;
+
+       void set_position (nframes_t);
        void set_name (const string&);
        void set_color_rgba (uint32_t rgba);
 
@@ -65,13 +69,13 @@ class Marker : public SigC::Object
   protected:
        PublicEditor& editor;
 
-       GtkCanvasItem *group;
-       GtkCanvasItem *mark;
-       GtkCanvasItem *text;
-       GtkCanvasPoints *points;
+       ArdourCanvas::Group *group;
+       ArdourCanvas::Polygon *mark;
+       ArdourCanvas::Text *text;
+       ArdourCanvas::Points *points;
 
        double    unit_position;
-       jack_nframes_t frame_position;
+       nframes_t frame_position;
        unsigned char      shift; /* should be double, but its always small and integral */
        Type      _type;
        
@@ -81,8 +85,7 @@ class Marker : public SigC::Object
 class TempoMarker : public Marker
 {
   public:
-       TempoMarker (PublicEditor& editor, GtkCanvasGroup *parent, guint32 rgba, const string& text, ARDOUR::TempoSection&, 
-                    gint (*callback)(GtkCanvasItem *, GdkEvent *, gpointer));
+        TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::TempoSection&);
        ~TempoMarker ();
 
        ARDOUR::TempoSection& tempo() const { return _tempo; }
@@ -94,8 +97,7 @@ class TempoMarker : public Marker
 class MeterMarker : public Marker
 {
   public:
-       MeterMarker (PublicEditor& editor, GtkCanvasGroup *parent, guint32 rgba, const string& text, ARDOUR::MeterSection&, 
-                    gint (*callback)(GtkCanvasItem *, GdkEvent *, gpointer));
+        MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::MeterSection&);
        ~MeterMarker ();
 
        ARDOUR::MeterSection& meter() const { return _meter; }