diff options
author | Tim Mayberry <mojofunk@gmail.com> | 2015-01-02 21:44:54 +0700 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-09-16 16:55:17 -0400 |
commit | 6b019a495359909a3d1a778ca10cd7df7cc302cc (patch) | |
tree | 75746a1e4a3daecd8c9cd0996b3c63d7d1657be4 /gtk2_ardour/tempo_lines.cc | |
parent | 45d487f16e8be102bfcdefcd950a69c886495b94 (diff) |
Move UIConfiguration Singleton into UIConfiguration header
This removes the direct dependence on ardour_ui.h from 39 files
Diffstat (limited to 'gtk2_ardour/tempo_lines.cc')
-rw-r--r-- | gtk2_ardour/tempo_lines.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/tempo_lines.cc b/gtk2_ardour/tempo_lines.cc index 5d8b7be86a..3c24ee0501 100644 --- a/gtk2_ardour/tempo_lines.cc +++ b/gtk2_ardour/tempo_lines.cc @@ -22,10 +22,10 @@ #include "canvas/canvas.h" #include "canvas/debug.h" -#include "ardour_ui.h" +#include "tempo_lines.h" #include "public_editor.h" #include "rgb_macros.h" -#include "tempo_lines.h" +#include "ui_config.h" using namespace std; @@ -60,7 +60,7 @@ TempoLines::draw_ticks (const ARDOUR::TempoMap::BBTPointList::const_iterator& b, framecnt_t frame_rate) { const double fpb = b->tempo->frames_per_beat(frame_rate); - const uint32_t base = ARDOUR_UI::config()->color_mod("measure line beat", "measure line beat"); + const uint32_t base = UIConfiguration::instance().color_mod("measure line beat", "measure line beat"); for (unsigned l = 1; l < divisions; ++l) { /* find the coarsest division level this tick falls on */ @@ -127,12 +127,12 @@ TempoLines::draw (const ARDOUR::TempoMap::BBTPointList::const_iterator& begin, for (i = begin; i != end; ++i) { if ((*i).is_bar()) { - color = ARDOUR_UI::config()->color ("measure line bar"); + color = UIConfiguration::instance().color ("measure line bar"); } else { if (beat_density > 0.3) { continue; /* only draw beat lines if the gaps between beats are large. */ } - color = ARDOUR_UI::config()->color_mod ("measure line beat", "measure line beat"); + color = UIConfiguration::instance().color_mod ("measure line beat", "measure line beat"); } ArdourCanvas::Coord xpos = PublicEditor::instance().sample_to_pixel_unrounded ((*i).frame); |