diff options
| author | Taybin Rutkin <taybin@taybin.com> | 2005-09-25 22:26:56 +0000 |
|---|---|---|
| committer | Taybin Rutkin <taybin@taybin.com> | 2005-09-25 22:26:56 +0000 |
| commit | 14d43ca9fe28a8309b4a52fa85e2b0c64a92248b (patch) | |
| tree | 0ca37421248da4aaba70869fbc0156bf64e3b0ce /gtk2_ardour/marker.h | |
| parent | d38e2213d79b1c8952c776a3b60f7709457edc0c (diff) | |
Switched to use libgnomecanvas (not the C++ one).
git-svn-id: svn://localhost/trunk/ardour2@30 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker.h')
| -rw-r--r-- | gtk2_ardour/marker.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h index 8843f68427..77d2976dd1 100644 --- a/gtk2_ardour/marker.h +++ b/gtk2_ardour/marker.h @@ -24,7 +24,7 @@ #include <string> #include <glib.h> #include <ardour/ardour.h> -#include <gtk-canvas.h> +#include <libgnomecanvas/libgnomecanvas.h> #include <sigc++/signal.h> namespace ARDOUR { @@ -49,8 +49,8 @@ class Marker : public sigc::trackable 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, GnomeCanvasGroup *parent, guint32 rgba, const string& text, Type, + gint (*callback)(GnomeCanvasItem *, GdkEvent *, gpointer), jack_nframes_t frame = 0); virtual ~Marker (); void set_position (jack_nframes_t); @@ -65,10 +65,10 @@ class Marker : public sigc::trackable protected: PublicEditor& editor; - GtkCanvasItem *group; - GtkCanvasItem *mark; - GtkCanvasItem *text; - GtkCanvasPoints *points; + GnomeCanvasItem *group; + GnomeCanvasItem *mark; + GnomeCanvasItem *text; + GnomeCanvasPoints *points; double unit_position; jack_nframes_t frame_position; @@ -81,8 +81,8 @@ class Marker : public sigc::trackable 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, GnomeCanvasGroup *parent, guint32 rgba, const string& text, ARDOUR::TempoSection&, + gint (*callback)(GnomeCanvasItem *, GdkEvent *, gpointer)); ~TempoMarker (); ARDOUR::TempoSection& tempo() const { return _tempo; } @@ -94,8 +94,8 @@ 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, GnomeCanvasGroup *parent, guint32 rgba, const string& text, ARDOUR::MeterSection&, + gint (*callback)(GnomeCanvasItem *, GdkEvent *, gpointer)); ~MeterMarker (); ARDOUR::MeterSection& meter() const { return _meter; } |