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/note_base.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/note_base.cc')
| -rw-r--r-- | gtk2_ardour/note_base.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/note_base.cc b/gtk2_ardour/note_base.cc index 56ce3bc9d1..bd4847be4e 100644 --- a/gtk2_ardour/note_base.cc +++ b/gtk2_ardour/note_base.cc @@ -96,7 +96,7 @@ NoteBase::show_velocity() if (!_text) { _text = new Text (_item->parent ()); _text->set_ignore_events (true); - _text->set_color (ARDOUR_UI::config()->color_mod ("midi note velocity text", "midi note velocity text")); + _text->set_color (UIConfiguration::instance().color_mod ("midi note velocity text", "midi note velocity text")); _text->set_alignment (Pango::ALIGN_CENTER); } @@ -121,8 +121,8 @@ NoteBase::on_channel_selection_change(uint16_t selection) { // make note change its color if its channel is not marked active if ( (selection & (1 << _note->channel())) == 0 ) { - set_fill_color(ARDOUR_UI::config()->color ("midi note inactive channel")); - set_outline_color(calculate_outline(ARDOUR_UI::config()->color ("midi note inactive channel"), + set_fill_color(UIConfiguration::instance().color ("midi note inactive channel")); + set_outline_color(calculate_outline(UIConfiguration::instance().color ("midi note inactive channel"), _selected)); } else { // set the color according to the notes selection state @@ -170,13 +170,13 @@ NoteBase::base_color() { uint32_t color = _region.midi_stream_view()->get_region_color(); return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (color, opacity), - ARDOUR_UI::config()->color ("midi note selected"), + UIConfiguration::instance().color ("midi note selected"), 0.5); } case ChannelColors: return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (NoteBase::midi_channel_colors[_note->channel()], opacity), - ARDOUR_UI::config()->color ("midi note selected"), 0.5); + UIConfiguration::instance().color ("midi note selected"), 0.5); default: return meter_style_fill_color(_note->velocity(), selected()); |