projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'canvasredesign' into cairocanvas
[ardour.git]
/
gtk2_ardour
/
marker.h
diff --git
a/gtk2_ardour/marker.h
b/gtk2_ardour/marker.h
index b3a85294ea20e4cf56a4e5223ca1d9d36561d2c8..facaaffb09d9989dfb404143a92a21af62425b23 100644
(file)
--- a/
gtk2_ardour/marker.h
+++ b/
gtk2_ardour/marker.h
@@
-56,7
+56,7
@@
class Marker : public sigc::trackable
};
};
- Marker (PublicEditor& editor, ArdourCanvas::
Group
&, guint32 rgba, const std::string& text, Type,
+ Marker (PublicEditor& editor, ArdourCanvas::
Layout
&, guint32 rgba, const std::string& text, Type,
framepos_t frame = 0, bool handle_events = true);
virtual ~Marker ();
framepos_t frame = 0, bool handle_events = true);
virtual ~Marker ();
@@
-76,8
+76,8
@@
class Marker : public sigc::trackable
framepos_t position() const { return frame_position; }
framepos_t position() const { return frame_position; }
- ArdourCanvas::
Group
* get_parent() { return _parent; }
- void reparent (ArdourCanvas::
Group
& parent);
+ ArdourCanvas::
Layout
* get_parent() { return _parent; }
+ void reparent (ArdourCanvas::
Layout
& parent);
void hide ();
void show ();
void hide ();
void show ();
@@
-98,12
+98,11
@@
class Marker : public sigc::trackable
Pango::FontDescription name_font;
Pango::FontDescription name_font;
- ArdourCanvas::
Group
* _parent;
- ArdourCanvas::
Group
*group;
+ ArdourCanvas::
Layout
* _parent;
+ ArdourCanvas::
Layout
*group;
ArdourCanvas::Polygon *mark;
ArdourCanvas::Text *_name_item;
ArdourCanvas::Points *points;
ArdourCanvas::Polygon *mark;
ArdourCanvas::Text *_name_item;
ArdourCanvas::Points *points;
- ArdourCanvas::Line* _time_bars_line;
ArdourCanvas::Line* _track_canvas_line;
ArdourCanvas::Rectangle* _name_background;
ArdourCanvas::Line* _track_canvas_line;
ArdourCanvas::Rectangle* _name_background;
@@
-135,7
+134,7
@@
private:
class TempoMarker : public Marker
{
public:
class TempoMarker : public Marker
{
public:
- TempoMarker (PublicEditor& editor, ArdourCanvas::
Group
&, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
+ TempoMarker (PublicEditor& editor, ArdourCanvas::
Layout
&, guint32 rgba, const std::string& text, ARDOUR::TempoSection&);
~TempoMarker ();
ARDOUR::TempoSection& tempo() const { return _tempo; }
~TempoMarker ();
ARDOUR::TempoSection& tempo() const { return _tempo; }
@@
-147,7
+146,7
@@
class TempoMarker : public Marker
class MeterMarker : public Marker
{
public:
class MeterMarker : public Marker
{
public:
- MeterMarker (PublicEditor& editor, ArdourCanvas::
Group
&, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
+ MeterMarker (PublicEditor& editor, ArdourCanvas::
Layout
&, guint32 rgba, const std::string& text, ARDOUR::MeterSection&);
~MeterMarker ();
ARDOUR::MeterSection& meter() const { return _meter; }
~MeterMarker ();
ARDOUR::MeterSection& meter() const { return _meter; }