From 6b019a495359909a3d1a778ca10cd7df7cc302cc Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Fri, 2 Jan 2015 21:44:54 +0700 Subject: Move UIConfiguration Singleton into UIConfiguration header This removes the direct dependence on ardour_ui.h from 39 files --- gtk2_ardour/verbose_cursor.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gtk2_ardour/verbose_cursor.cc') diff --git a/gtk2_ardour/verbose_cursor.cc b/gtk2_ardour/verbose_cursor.cc index ff0f7429f9..84d75d2451 100644 --- a/gtk2_ardour/verbose_cursor.cc +++ b/gtk2_ardour/verbose_cursor.cc @@ -26,12 +26,13 @@ #include "canvas/scroll_group.h" #include "canvas/tracking_text.h" -#include "ardour_ui.h" #include "audio_clock.h" #include "editor.h" #include "editor_drag.h" #include "main_clock.h" #include "verbose_cursor.h" +#include "ardour_ui.h" +#include "ui_config.h" #include "i18n.h" @@ -43,16 +44,16 @@ VerboseCursor::VerboseCursor (Editor* editor) { _canvas_item = new ArdourCanvas::TrackingText (_editor->get_noscroll_group()); CANVAS_DEBUG_NAME (_canvas_item, "verbose canvas cursor"); - _canvas_item->set_font_description (Pango::FontDescription (ARDOUR_UI::config()->get_LargerBoldFont())); + _canvas_item->set_font_description (Pango::FontDescription (UIConfiguration::instance().get_LargerBoldFont())); color_handler (); - UIConfiguration::ColorsChanged.connect (sigc::mem_fun (*this, &VerboseCursor::color_handler)); + UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &VerboseCursor::color_handler)); } void VerboseCursor::color_handler () { - _canvas_item->set_color (ARDOUR_UI::config()->color_mod ("verbose canvas cursor", "verbose canvas cursor")); + _canvas_item->set_color (UIConfiguration::instance().color_mod ("verbose canvas cursor", "verbose canvas cursor")); } ArdourCanvas::Item * -- cgit v1.2.3