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/streamview.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/streamview.cc')
| -rw-r--r-- | gtk2_ardour/streamview.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc index 4a9ed0efe8..5f50b7e8cb 100644 --- a/gtk2_ardour/streamview.cc +++ b/gtk2_ardour/streamview.cc @@ -39,10 +39,10 @@ #include "region_selection.h" #include "selection.h" #include "public_editor.h" -#include "ardour_ui.h" #include "timers.h" #include "rgb_macros.h" #include "gui_thread.h" +#include "ui_config.h" #include "utils.h" #include "i18n.h" @@ -85,7 +85,7 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Container* canvas_g _trackview.session()->RecordStateChanged.connect (*this, invalidator (*this), boost::bind (&StreamView::sess_rec_enable_changed, this), gui_context()); } - UIConfiguration::ColorsChanged.connect (sigc::mem_fun (*this, &StreamView::color_handler)); + UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &StreamView::color_handler)); } StreamView::~StreamView () @@ -409,7 +409,7 @@ StreamView::create_rec_box(framepos_t frame_pos, double width) { const double xstart = _trackview.editor().sample_to_pixel(frame_pos); const double xend = xstart + width; - const uint32_t fill_color = ARDOUR_UI::config()->color_mod("recording rect", "recording_rect"); + const uint32_t fill_color = UIConfiguration::instance().color_mod("recording rect", "recording_rect"); ArdourCanvas::Rectangle* rec_rect = new ArdourCanvas::Rectangle(_canvas_group); rec_rect->set_x0(xstart); @@ -417,7 +417,7 @@ StreamView::create_rec_box(framepos_t frame_pos, double width) rec_rect->set_x1(xend); rec_rect->set_y1(child_height ()); rec_rect->set_outline_what(ArdourCanvas::Rectangle::What(0)); - rec_rect->set_outline_color(ARDOUR_UI::config()->color("recording rect")); + rec_rect->set_outline_color(UIConfiguration::instance().color("recording rect")); rec_rect->set_fill_color(fill_color); rec_rect->lower_to_bottom(); |