projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Editor Summary: Don't require user to re-click to scroll + zoom.
[ardour.git]
/
gtk2_ardour
/
marker.h
diff --git
a/gtk2_ardour/marker.h
b/gtk2_ardour/marker.h
index e80b87e9c8b15874a6d73534fd325f1fe886c94f..391653f0901c3daf5a12d64bf53d190af1204eb0 100644
(file)
--- a/
gtk2_ardour/marker.h
+++ b/
gtk2_ardour/marker.h
@@
-44,7
+44,7
@@
class PublicEditor;
*/
class ArdourMarker : public sigc::trackable
{
*/
class ArdourMarker : public sigc::trackable
{
-
public:
+public:
enum Type {
Mark,
Tempo,
enum Type {
Mark,
Tempo,
@@
-61,7
+61,7
@@
class ArdourMarker : public sigc::trackable
ArdourMarker (PublicEditor& editor, ArdourCanvas::Container &, 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 ~ArdourMarker ();
virtual ~ArdourMarker ();
@@
-77,6
+77,7
@@
class ArdourMarker : 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 ();
void set_color_rgba (uint32_t rgba);
void setup_line ();
@@
-99,7
+100,7
@@
class ArdourMarker : public sigc::trackable
bool label_on_left () const;
bool label_on_left () const;
-
protected:
+protected:
PublicEditor& editor;
Pango::FontDescription name_font;
PublicEditor& editor;
Pango::FontDescription name_font;
@@
-107,7
+108,7
@@
class ArdourMarker : public sigc::trackable
ArdourCanvas::Container* _parent;
ArdourCanvas::Container *group;
ArdourCanvas::Polygon *mark;
ArdourCanvas::Container* _parent;
ArdourCanvas::Container *group;
ArdourCanvas::Polygon *mark;
-
ArdourCanvas::Text *_name_item;
+ ArdourCanvas::Text *_name_item;
ArdourCanvas::Points *points;
ArdourCanvas::Line* _track_canvas_line;
ArdourCanvas::Rectangle* _name_background;
ArdourCanvas::Points *points;
ArdourCanvas::Line* _track_canvas_line;
ArdourCanvas::Rectangle* _name_background;
@@
-123,6
+124,7
@@
class ArdourMarker : 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;
@@
-140,7
+142,7
@@
private:
class TempoMarker : public ArdourMarker
{
public:
class TempoMarker : public ArdourMarker
{
public:
-
TempoMarker (PublicEditor& editor, ArdourCanvas::Container &, 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; }
@@
-153,7
+155,7
@@
class TempoMarker : public ArdourMarker
class MeterMarker : public ArdourMarker
{
public:
class MeterMarker : public ArdourMarker
{
public:
-
MeterMarker (PublicEditor& editor, ArdourCanvas::Container &, 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; }