#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;
class PublicEditor;
-class Marker : public SigC::Object
+class Marker : public sigc::trackable
{
public:
enum Type {
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);
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;
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; }
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; }