diff options
author | Doug McLain <doug@nostar.net> | 2007-06-29 17:13:09 +0000 |
---|---|---|
committer | Doug McLain <doug@nostar.net> | 2007-06-29 17:13:09 +0000 |
commit | 4c000c13eecf4cb3d63be304fc0056ddaa35bb21 (patch) | |
tree | 257f65636491f137abb7d3282661080bc5dfce8b /gtk2_ardour/editor_tempodisplay.cc | |
parent | a67dcdc267bc133cab63e0e6355edbfa5dacb6ab (diff) |
Moved canvas colors and theme file selection into new ui specific config system
git-svn-id: svn://localhost/ardour2/trunk@2086 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_tempodisplay.cc')
-rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index c1cc2bb3a8..08fc136da6 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -44,6 +44,7 @@ #include "gui_thread.h" #include "color.h" #include "time_axis_view.h" +#include "ardour_ui.h" #include "i18n.h" @@ -80,11 +81,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, Config->canvasvar_MeterMarker.get(), 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, Config->canvasvar_TempoMarker.get(), buf, + metric_marks.push_back (new TempoMarker (*this, *tempo_group, ARDOUR_UI::config()->canvasvar_TempoMarker.get(), buf, *(const_cast<TempoSection*>(ts)))); } @@ -249,9 +250,9 @@ Editor::draw_measures () case TempoMap::Beat: if ((*i).beat == 1) { - color = Config->canvasvar_MeasureLineBar.get(); + color = ARDOUR_UI::config()->canvasvar_MeasureLineBar.get(); } else { - color = Config->canvasvar_MeasureLineBeat.get(); + color = ARDOUR_UI::config()->canvasvar_MeasureLineBeat.get(); if (beat_density > 2.0) { /* only draw beat lines if the gaps between beats are large. |