diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-24 14:59:36 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-24 14:59:36 +0000 |
| commit | 3ff9964885eee5f7654e5ae562cadfaa1e998fe9 (patch) | |
| tree | fb1342a45c7a72c3a91368b75ee8db21fa7916fc /gtk2_ardour/marker.h | |
| parent | 54a80321064aa543023cd0b224ba9d433520983f (diff) | |
advance compiling to the m*.cc point
git-svn-id: svn://localhost/trunk/ardour2@108 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker.h')
| -rw-r--r-- | gtk2_ardour/marker.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h index bcf4357f19..13e80ef512 100644 --- a/gtk2_ardour/marker.h +++ b/gtk2_ardour/marker.h @@ -24,9 +24,6 @@ #include <string> #include <glib.h> #include <ardour/ardour.h> -#include <libgnomecanvasmm/group.h> -#include <libgnomecanvasmm/text.h> -#include <libgnomecanvasmm/polygon.h> #include <sigc++/signal.h> #include "canvas.h" @@ -53,10 +50,14 @@ class Marker : public sigc::trackable PunchOut }; + Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, Type, - gint (*callback)(ArdourCanvas::Item *, GdkEvent *, gpointer), jack_nframes_t frame = 0); + jack_nframes_t frame = 0, bool handle_events = true); + virtual ~Marker (); + ArdourCanvas::Item& the_item() const; + void set_position (jack_nframes_t); void set_name (const string&); void set_color_rgba (uint32_t rgba); @@ -70,7 +71,7 @@ class Marker : public sigc::trackable PublicEditor& editor; ArdourCanvas::Group *group; - ArdourCanvas::Item *mark; + ArdourCanvas::Polygon *mark; ArdourCanvas::Text *text; ArdourCanvas::Points *points; @@ -85,8 +86,7 @@ class Marker : public sigc::trackable class TempoMarker : public Marker { public: - TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::TempoSection&, - gint (*callback)(ArdourCanvas::Item *, GdkEvent *, gpointer)); + TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::TempoSection&); ~TempoMarker (); ARDOUR::TempoSection& tempo() const { return _tempo; } @@ -98,8 +98,7 @@ class TempoMarker : public Marker class MeterMarker : public Marker { public: - MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::MeterSection&, - gint (*callback)(ArdourCanvas::Item *, GdkEvent *, gpointer)); + MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::MeterSection&); ~MeterMarker (); ARDOUR::MeterSection& meter() const { return _meter; } |