diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-22 11:41:05 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-22 11:41:05 -0400 |
| commit | 6a5d805b383cd71bb1d0984964439c5ec08e9270 (patch) | |
| tree | d551b417d1dbc026376207a94b4933a0b824797b /gtk2_ardour/marker.cc | |
| parent | f0933bf00551ce998ca441aa5611d27702f6e590 (diff) | |
more canvas refactoring.
Remove Canvas::Layout, use Canvas::Container for the same purpose, move child-rendering into Item::render_children() so that it
could theoretically be used by any derived type.
Diffstat (limited to 'gtk2_ardour/marker.cc')
| -rw-r--r-- | gtk2_ardour/marker.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index ea47929db7..1374d96127 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -21,7 +21,7 @@ #include "ardour/tempo.h" #include "canvas/rectangle.h" -#include "canvas/layout.h" +#include "canvas/container.h" #include "canvas/line.h" #include "canvas/polygon.h" #include "canvas/text.h" @@ -53,7 +53,7 @@ PBD::Signal1<void,Marker*> Marker::CatchDeletion; static const double marker_height = 13.0; -Marker::Marker (PublicEditor& ed, ArdourCanvas::Layout& parent, guint32 rgba, const string& annotation, +Marker::Marker (PublicEditor& ed, ArdourCanvas::Container& parent, guint32 rgba, const string& annotation, Type type, framepos_t frame, bool handle_events) : editor (ed) @@ -242,7 +242,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Layout& parent, guint32 rgba, co unit_position = editor.sample_to_pixel (frame); unit_position -= _shift; - group = new ArdourCanvas::Layout (&parent, ArdourCanvas::Duple (unit_position, 0)); + group = new ArdourCanvas::Container (&parent, ArdourCanvas::Duple (unit_position, 0)); #ifdef CANVAS_DEBUG group->name = string_compose ("Marker::group for %1", annotation); #endif @@ -302,7 +302,7 @@ Marker::~Marker () delete _track_canvas_line; } -void Marker::reparent(ArdourCanvas::Layout & parent) +void Marker::reparent(ArdourCanvas::Container & parent) { group->reparent (&parent); _parent = &parent; @@ -501,7 +501,7 @@ Marker::set_right_label_limit (double p) /***********************************************************************/ -TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Layout& parent, guint32 rgba, const string& text, +TempoMarker::TempoMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text, ARDOUR::TempoSection& temp) : Marker (editor, parent, rgba, text, Tempo, 0, false), _tempo (temp) @@ -516,7 +516,7 @@ TempoMarker::~TempoMarker () /***********************************************************************/ -MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Layout& parent, guint32 rgba, const string& text, +MeterMarker::MeterMarker (PublicEditor& editor, ArdourCanvas::Container& parent, guint32 rgba, const string& text, ARDOUR::MeterSection& m) : Marker (editor, parent, rgba, text, Meter, 0, false), _meter (m) |