diff options
| author | David Robillard <d@drobilla.net> | 2008-01-10 21:20:59 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-01-10 21:20:59 +0000 |
| commit | bb457bb960c5bd7ed538f9d31477293415739f68 (patch) | |
| tree | 84324a63b87c03589cd165b9e474296eaebb4772 /gtk2_ardour/marker.cc | |
| parent | 73dd9d37e7d715e0d78c0e51569968f9494dac7f (diff) | |
Merge libs/ardour and gtk2_ardour with 2.0-ongoing R2837.
git-svn-id: svn://localhost/ardour2/trunk@2883 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker.cc')
| -rw-r--r-- | gtk2_ardour/marker.cc | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index de2ceb554e..6e37908d1b 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -33,7 +33,7 @@ using namespace ARDOUR; Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation, Type type, nframes_t frame, bool handle_events) - : editor (ed), _type(type) + : editor (ed), _parent(&parent), _type(type) { double label_offset = 0; bool annotate_left = false; @@ -273,6 +273,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con } + Marker::~Marker () { drop_references (); @@ -288,6 +289,21 @@ Marker::~Marker () } } +void Marker::reparent(ArdourCanvas::Group & parent) +{ + group->reparent(parent); + _parent = &parent; +} + +void +Marker::set_line_length (double len) +{ + if (line) { + line_points->back().set_y (len); + line->property_points() = *line_points; + } +} + void Marker::add_line (ArdourCanvas::Group* group, double initial_height) { @@ -301,12 +317,13 @@ Marker::add_line (ArdourCanvas::Group* group, double initial_height) line->property_width_pixels() = 1; line->property_points() = *line_points; line->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_EditPoint.get(); +#if 0 line->property_first_arrowhead() = TRUE; line->property_last_arrowhead() = TRUE; line->property_arrow_shape_a() = 11.0; line->property_arrow_shape_b() = 0.0; line->property_arrow_shape_c() = 9.0; - +#endif line->signal_event().connect (bind (mem_fun (editor, &PublicEditor::canvas_marker_event), mark, this)); } @@ -383,6 +400,7 @@ void Marker::set_color_rgba (uint32_t color) { mark->property_fill_color_rgba() = color; + mark->property_outline_color_rgba() = color; } /***********************************************************************/ |