/*
- 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
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__
#include <string>
#include <glib.h>
-#include <ardour/ardour.h>
-#include <gtk-canvas.h>
-#include <sigc++/signal.h>
+
+#include <libgnomecanvasmm/pixbuf.h>
+
+#include "ardour/ardour.h"
+#include "pbd/destructible.h"
+
+#include "canvas.h"
namespace ARDOUR {
class TempoSection;
class PublicEditor;
-class Marker : public sigc::trackable
+class Marker : public PBD::Destructible
{
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 std::string& text, Type,
+ nframes_t frame = 0, bool handle_events = true);
+
virtual ~Marker ();
- void set_position (jack_nframes_t);
- void set_name (const string&);
+ ArdourCanvas::Item& the_item() const;
+
+ void add_line (ArdourCanvas::Group*, double y_origin, double initial_height);
+ void show_line ();
+ void hide_line ();
+ void set_line_vpos (double y_origin, double height);
+
+ void set_position (nframes64_t);
+ void set_name (const std::string&);
void set_color_rgba (uint32_t rgba);
+ nframes64_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; }
-
+
protected:
PublicEditor& editor;
- GtkCanvasItem *group;
- GtkCanvasItem *mark;
- GtkCanvasItem *text;
- GtkCanvasPoints *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;
+
+ double unit_position;
+ nframes64_t frame_position;
+ unsigned char shift; /* should be double, but its always small and integral */
+ Type _type;
+ int name_height;
- double unit_position;
- jack_nframes_t frame_position;
- unsigned char shift; /* should be double, but its always small and integral */
- Type _type;
-
void reposition ();
};
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 std::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 std::string& text, ARDOUR::MeterSection&);
~MeterMarker ();
ARDOUR::MeterSection& meter() const { return _meter; }