/*
- 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
#include <string>
#include <glib.h>
-#include <ardour/ardour.h>
-#include <pbd/destructible.h>
+
+#include <libgnomecanvasmm/pixbuf.h>
+#include <sigc++/signal.h>
+
+#include "ardour/ardour.h"
+#include "pbd/signals.h"
#include "canvas.h"
class PublicEditor;
-class Marker : public PBD::Destructible
+class Marker : public sigc::trackable
{
public:
enum Type {
Mark,
Tempo,
Meter,
- Start,
- End,
+ Start, ///< session start
+ End, ///< session end
LoopStart,
LoopEnd,
PunchIn,
};
- Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, Type,
+ Marker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, Type,
nframes_t frame = 0, bool handle_events = true);
virtual ~Marker ();
+ static PBD::Signal1<void,Marker*> CatchDeletion;
+
ArdourCanvas::Item& the_item() const;
- void add_line (ArdourCanvas::Group*, double initial_height);
+ void add_line (ArdourCanvas::Group*, double y_origin, double initial_height);
void show_line ();
void hide_line ();
- void set_line_length (double);
+ void set_line_vpos (double y_origin, double height);
- void set_position (nframes_t);
- void set_name (const string&);
+ 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 ();
protected:
PublicEditor& editor;
+ Pango::FontDescription* name_font;
+
ArdourCanvas::Group * _parent;
ArdourCanvas::Group *group;
ArdourCanvas::Polygon *mark;
- ArdourCanvas::Text *text;
+ ArdourCanvas::Pixbuf *name_pixbuf;
ArdourCanvas::Points *points;
- ArdourCanvas::Line *line;
+ 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;
-
+ Type _type;
+ int name_height;
+
void reposition ();
};
class TempoMarker : public Marker
{
public:
- TempoMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::TempoSection&);
+ 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, ArdourCanvas::Group& parent, guint32 rgba, const string& text, ARDOUR::MeterSection&);
+ MeterMarker (PublicEditor& editor, ArdourCanvas::Group& parent, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
~MeterMarker ();
ARDOUR::MeterSection& meter() const { return _meter; }