smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

Move UIConfiguration Singleton into UIConfiguration header

Browse source 
This removes the direct dependence on ardour_ui.h from 39 files
This commit is contained in:
Tim Mayberry 2015-01-02 21:44:54 +07:00 • committed by Paul Davis
parent 45d487f16e
commit 6b019a4953
84 changed files with 726 additions and 712 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/automation_streamview.cc
View file

@ -30,7 +30,6 @@
#include "ardour/midi_region.h"
#include "ardour/midi_source.h"
#include "ardour_ui.h"
#include "automation_region_view.h"
#include "automation_streamview.h"
#include "automation_time_axis.h"
@ -40,6 +39,7 @@
#include "region_view.h"
#include "rgb_macros.h"
#include "selection.h"
#include "ui_config.h"
#include "i18n.h"
@ -60,7 +60,7 @@ AutomationStreamView::AutomationStreamView (AutomationTimeAxisView& tv)
color_handler ();
UIConfiguration::ColorsChanged.connect(sigc::mem_fun(*this, &AutomationStreamView::color_handler));
UIConfiguration::instance().ColorsChanged.connect(sigc::mem_fun(*this, &AutomationStreamView::color_handler));
}
AutomationStreamView::~AutomationStreamView ()
@ -202,9 +202,9 @@ void
AutomationStreamView::color_handler ()
{
if (_trackview.is_midi_track()) {
canvas_rect->set_fill_color (ARDOUR_UI::config()->color_mod ("midi track base", "midi track base"));
canvas_rect->set_fill_color (UIConfiguration::instance().color_mod ("midi track base", "midi track base"));
} else {
canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("midi bus base"));
canvas_rect->set_fill_color (UIConfiguration::instance().color ("midi bus base"));
}
}