diff options
| author | Doug McLain <doug@nostar.net> | 2007-07-05 05:33:40 +0000 |
|---|---|---|
| committer | Doug McLain <doug@nostar.net> | 2007-07-05 05:33:40 +0000 |
| commit | 291a186cba343ed705c60d15fa7db0b21eb8a1fd (patch) | |
| tree | 683a299b237164b5a67d2d79e9b05dc2251b8f46 /gtk2_ardour/editor_tempodisplay.cc | |
| parent | 0518b045c62ef764eced6fff0b64d4f71832a7b0 (diff) | |
New theme manager from trunk, backported to 2.0-ongoing
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2110 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_tempodisplay.cc')
| -rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 339c335fa3..df16a8e47f 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -42,7 +42,7 @@ #include "tempo_dialog.h" #include "rgb_macros.h" #include "gui_thread.h" -#include "color.h" +#include "ardour_ui.h" #include "time_axis_view.h" #include "i18n.h" @@ -80,11 +80,11 @@ Editor::draw_metric_marks (const Metrics& metrics) if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) { snprintf (buf, sizeof(buf), "%g/%g", ms->beats_per_bar(), ms->note_divisor ()); - metric_marks.push_back (new MeterMarker (*this, *meter_group, color_map[cMeterMarker], buf, + metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->canvasvar_MeterMarker.get(), buf, *(const_cast<MeterSection*>(ms)))); } else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) { snprintf (buf, sizeof (buf), "%.2f", ts->beats_per_minute()); - metric_marks.push_back (new TempoMarker (*this, *tempo_group, color_map[cTempoMarker], buf, + metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), buf, *(const_cast<TempoSection*>(ts)))); } @@ -249,9 +249,9 @@ Editor::draw_measures () case TempoMap::Beat: if ((*i).beat == 1) { - color = color_map[cMeasureLineBar]; + color = ARDOUR_UI::config()->canvasvar_MeasureLineBar.get(); } else { - color = color_map[cMeasureLineBeat]; + color = ARDOUR_UI::config()->canvasvar_MeasureLineBeat.get(); if (beat_density > 2.0) { /* only draw beat lines if the gaps between beats are large. |