diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-16 23:46:22 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-16 23:46:22 -0400 |
| commit | 96eee9e7a162e3e26dd9c1ea4d8fc1ad02a3dda9 (patch) | |
| tree | 3c0031f7cc5a6c729cd2bba347b37577aec95a16 /gtk2_ardour/note_base.cc | |
| parent | eed0201c077d6b290cd7587e752a524803bb2b89 (diff) | |
change UIConfig to use accessor/setter methods like RCConfig so that ParameterChanged methods can actually be emitted; add variable (over a small range) background shading for all TimeAxisViewItems
Diffstat (limited to 'gtk2_ardour/note_base.cc')
| -rw-r--r-- | gtk2_ardour/note_base.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/note_base.cc b/gtk2_ardour/note_base.cc index d4a2a63a92..e2ff2c1797 100644 --- a/gtk2_ardour/note_base.cc +++ b/gtk2_ardour/note_base.cc @@ -98,7 +98,7 @@ NoteBase::show_velocity() if (!_text) { _text = new Text (_item->parent ()); _text->set_ignore_events (true); - _text->set_color (ARDOUR_UI::config()->canvasvar_MidiNoteVelocityText.get()); + _text->set_color (ARDOUR_UI::config()->get_canvasvar_MidiNoteVelocityText()); _text->set_alignment (Pango::ALIGN_CENTER); } @@ -123,8 +123,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()->canvasvar_MidiNoteInactiveChannel.get()); - set_outline_color(calculate_outline(ARDOUR_UI::config()->canvasvar_MidiNoteInactiveChannel.get())); + set_fill_color(ARDOUR_UI::config()->get_canvasvar_MidiNoteInactiveChannel()); + set_outline_color(calculate_outline(ARDOUR_UI::config()->get_canvasvar_MidiNoteInactiveChannel())); } else { // set the color according to the notes selection state set_selected(_selected); @@ -202,7 +202,7 @@ NoteBase::set_selected(bool selected) set_fill_color (base_color ()); if (_selected) { - set_outline_color(calculate_outline(ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get())); + set_outline_color(calculate_outline(ARDOUR_UI::config()->get_canvasvar_MidiNoteSelected())); if(_region.channel_selector_scoped_note() != 0){ _region.channel_selector_scoped_note()->hide_channel_selector(); @@ -236,13 +236,13 @@ NoteBase::base_color() SCALE_USHORT_TO_UINT8_T(color.get_green()), SCALE_USHORT_TO_UINT8_T(color.get_blue()), opacity), - ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get(), 0.5); + ARDOUR_UI::config()->get_canvasvar_MidiNoteSelected(), 0.5); } case ChannelColors: return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (NoteBase::midi_channel_colors[_note->channel()], opacity), - ARDOUR_UI::config()->canvasvar_MidiNoteSelected.get(), 0.5); + ARDOUR_UI::config()->get_canvasvar_MidiNoteSelected(), 0.5); default: return meter_style_fill_color(_note->velocity(), selected()); |