diff options
| author | Doug McLain <doug@nostar.net> | 2007-06-15 22:08:27 +0000 |
|---|---|---|
| committer | Doug McLain <doug@nostar.net> | 2007-06-15 22:08:27 +0000 |
| commit | 789cbb21810802adc478de3134fa42950c5e8569 (patch) | |
| tree | 565760bb936fea79f18697f72126111169bebae1 /gtk2_ardour/marker.cc | |
| parent | cd9fdb935f08966cc8c7170a39870e8adcae69d8 (diff) | |
Major Theme Manager changes, see ardour-dev
git-svn-id: svn://localhost/ardour2/trunk@1987 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/marker.cc')
| -rw-r--r-- | gtk2_ardour/marker.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 244079af41..0325bcfc31 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -28,6 +28,8 @@ #include "i18n.h" +using namespace ARDOUR; + Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, const string& annotation, Type type, nframes_t frame, bool handle_events) @@ -253,7 +255,7 @@ Marker::Marker (PublicEditor& ed, ArdourCanvas::Group& parent, guint32 rgba, con } text->property_y() = 0.0; text->property_anchor() = Gtk::ANCHOR_NW; - text->property_fill_color_rgba() = color_map[cMarkerLabel]; + text->property_fill_color_rgba() = Config->canvasvar_MarkerLabel.get(); editor.ZoomChanged.connect (mem_fun (*this, &Marker::reposition)); |