summaryrefslogtreecommitdiff
path: root/gtk2_ardour/marker.cc
diff options
context:
space:
mode:
authorJesse Chappell <jesse@essej.net>2007-11-23 04:57:39 +0000
committerJesse Chappell <jesse@essej.net>2007-11-23 04:57:39 +0000
commit90a5607604a6a8853fa780285561aff706531589 (patch)
tree0437e4e6d85667392f05b982401d569a2c389d87 /gtk2_ardour/marker.cc
parent8af8f2ee276e3f427895e0e57deab29dfa026d2b (diff)
added cd marker ruler, which displays and allows quick addition of cd track markers/ranges when visible, otherwise the cd markers are shown in the normal mark/range rulers.
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2711 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker.cc')
-rw-r--r--gtk2_ardour/marker.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc
index 63a6a8bc51..a785c2e060 100644
--- a/gtk2_ardour/marker.cc
+++ b/gtk2_ardour/marker.cc
@@ -31,7 +31,7 @@
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;
@@ -271,6 +271,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con
}
+
Marker::~Marker ()
{
drop_references ();
@@ -286,6 +287,12 @@ Marker::~Marker ()
}
}
+void Marker::reparent(ArdourCanvas::Group & parent)
+{
+ group->reparent(parent);
+ _parent = &parent;
+}
+
void
Marker::add_line (ArdourCanvas::Group* group, double initial_height)
{
@@ -381,6 +388,7 @@ void
Marker::set_color_rgba (uint32_t color)
{
mark->property_fill_color_rgba() = color;
+ mark->property_outline_color_rgba() = color;
}
/***********************************************************************/