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/editor_tempodisplay.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/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 7fe8759639..c1cc2bb3a8 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -70,7 +70,7 @@ void Editor::draw_metric_marks (const Metrics& metrics) { - const MeterSection *ms; + const MeterSection *ms; const TempoSection *ts; char buf[64]; @@ -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, 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, 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 = Config->canvasvar_MeasureLineBar.get(); } else { - color = color_map[cMeasureLineBeat]; + color = Config->canvasvar_MeasureLineBeat.get(); if (beat_density > 2.0) { /* only draw beat lines if the gaps between beats are large. |