projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Accommodate newly introduced source(s) in our MSVC project (libpbd)
[ardour.git]
/
gtk2_ardour
/
marker.h
diff --git
a/gtk2_ardour/marker.h
b/gtk2_ardour/marker.h
index facaaffb09d9989dfb404143a92a21af62425b23..e23c79b4bb3ed18436c99e7de94433ad6fad7244 100644
(file)
--- a/
gtk2_ardour/marker.h
+++ b/
gtk2_ardour/marker.h
@@
-38,7
+38,11
@@
namespace ARDOUR {
class PublicEditor;
class PublicEditor;
-class Marker : public sigc::trackable
+/** Location Marker
+ *
+ * Editor ruler representation of a location marker or range on the timeline.
+ */
+class ArdourMarker : public sigc::trackable
{
public:
enum Type {
{
public:
enum Type {
@@
-56,12
+60,14
@@
class Marker : public sigc::trackable
};
};
-
Marker (PublicEditor& editor, ArdourCanvas::Layout
&, guint32 rgba, const std::string& text, Type,
+
ArdourMarker (PublicEditor& editor, ArdourCanvas::Container
&, guint32 rgba, const std::string& text, Type,
framepos_t frame = 0, bool handle_events = true);
framepos_t frame = 0, bool handle_events = true);
- virtual ~Marker ();
+ virtual ~
Ardour
Marker ();
- static PBD::Signal1<void,Marker*> CatchDeletion;
+ static PBD::Signal1<void,ArdourMarker*> CatchDeletion;
+
+ static void setup_sizes (const double timebar_height);
ArdourCanvas::Item& the_item() const;
ArdourCanvas::Item& the_item() const;
@@
-71,13
+77,14
@@
class Marker : public sigc::trackable
void set_position (framepos_t);
void set_name (const std::string&);
void set_position (framepos_t);
void set_name (const std::string&);
+ void set_points_color (uint32_t rgba);
void set_color_rgba (uint32_t rgba);
void setup_line ();
framepos_t position() const { return frame_position; }
void set_color_rgba (uint32_t rgba);
void setup_line ();
framepos_t position() const { return frame_position; }
- ArdourCanvas::
Layout
* get_parent() { return _parent; }
- void reparent (ArdourCanvas::
Layout
& parent);
+ ArdourCanvas::
Container
* get_parent() { return _parent; }
+ void reparent (ArdourCanvas::
Container
& parent);
void hide ();
void show ();
void hide ();
void show ();
@@
-98,8
+105,8
@@
class Marker : public sigc::trackable
Pango::FontDescription name_font;
Pango::FontDescription name_font;
- ArdourCanvas::
Layout
* _parent;
- ArdourCanvas::
Layout
*group;
+ ArdourCanvas::
Container
* _parent;
+ ArdourCanvas::
Container
*group;
ArdourCanvas::Polygon *mark;
ArdourCanvas::Text *_name_item;
ArdourCanvas::Points *points;
ArdourCanvas::Polygon *mark;
ArdourCanvas::Text *_name_item;
ArdourCanvas::Points *points;
@@
-117,6
+124,7
@@
class Marker : public sigc::trackable
bool _line_shown;
double _canvas_height;
uint32_t _color;
bool _line_shown;
double _canvas_height;
uint32_t _color;
+ uint32_t _points_color;
double _left_label_limit; ///< the number of pixels available to the left of this marker for a label
double _right_label_limit; ///< the number of pixels available to the right of this marker for a label
double _label_offset;
double _left_label_limit; ///< the number of pixels available to the left of this marker for a label
double _right_label_limit; ///< the number of pixels available to the right of this marker for a label
double _label_offset;
@@
-127,26
+135,27
@@
class Marker : public sigc::trackable
private:
/* disallow copy construction */
private:
/* disallow copy construction */
-
Marker (
Marker const &);
-
Marker & operator= (
Marker const &);
+
ArdourMarker (Ardour
Marker const &);
+
ArdourMarker & operator= (Ardour
Marker const &);
};
};
-class TempoMarker : public Marker
+class TempoMarker : public
Ardour
Marker
{
public:
{
public:
- TempoMarker (PublicEditor& editor, ArdourCanvas::
Layout
&, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
+ TempoMarker (PublicEditor& editor, ArdourCanvas::
Container
&, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
~TempoMarker ();
ARDOUR::TempoSection& tempo() const { return _tempo; }
~TempoMarker ();
ARDOUR::TempoSection& tempo() const { return _tempo; }
+ void update_height_mark (const double ratio);
private:
ARDOUR::TempoSection& _tempo;
};
private:
ARDOUR::TempoSection& _tempo;
};
-class MeterMarker : public Marker
+class MeterMarker : public
Ardour
Marker
{
public:
{
public:
- MeterMarker (PublicEditor& editor, ArdourCanvas::
Layout
&, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
+ MeterMarker (PublicEditor& editor, ArdourCanvas::
Container
&, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
~MeterMarker ();
ARDOUR::MeterSection& meter() const { return _meter; }
~MeterMarker ();
ARDOUR::MeterSection& meter() const { return _meter; }