diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-10-21 22:55:08 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-10-21 22:58:58 -0400 |
| commit | ba4d1cd1c1d5e4b47e288cd83c81011e7399207b (patch) | |
| tree | ca91dc6ddffb96acf6a274664f12cd310b701281 /gtk2_ardour/note_base.cc | |
| parent | 90df6f3fe625a95275a70c0ef0565cf062f8445d (diff) | |
remove "canvasvar_" from all functions related to obtaining values from ARDOUR_UI::config()
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 1a02b6e02e..7bc45a4b25 100644 --- a/gtk2_ardour/note_base.cc +++ b/gtk2_ardour/note_base.cc @@ -94,7 +94,7 @@ NoteBase::show_velocity() if (!_text) { _text = new Text (_item->parent ()); _text->set_ignore_events (true); - _text->set_color (ARDOUR_UI::config()->get_canvasvar_MidiNoteVelocityText()); + _text->set_color (ARDOUR_UI::config()->get_MidiNoteVelocityText()); _text->set_alignment (Pango::ALIGN_CENTER); } @@ -119,8 +119,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()->get_canvasvar_MidiNoteInactiveChannel()); - set_outline_color(calculate_outline(ARDOUR_UI::config()->get_canvasvar_MidiNoteInactiveChannel())); + set_fill_color(ARDOUR_UI::config()->get_MidiNoteInactiveChannel()); + set_outline_color(calculate_outline(ARDOUR_UI::config()->get_MidiNoteInactiveChannel())); } else { // set the color according to the notes selection state set_selected(_selected); @@ -148,7 +148,7 @@ NoteBase::set_selected(bool selected) set_fill_color (base_color()); if (_selected) { - set_outline_color(calculate_outline(ARDOUR_UI::config()->get_canvasvar_MidiNoteSelected())); + set_outline_color(calculate_outline(ARDOUR_UI::config()->get_MidiNoteSelected())); } else { set_outline_color(calculate_outline(base_color())); } @@ -172,13 +172,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()->get_canvasvar_MidiNoteSelected(), + ARDOUR_UI::config()->get_MidiNoteSelected(), 0.5); } case ChannelColors: return UINT_INTERPOLATE (UINT_RGBA_CHANGE_A (NoteBase::midi_channel_colors[_note->channel()], opacity), - ARDOUR_UI::config()->get_canvasvar_MidiNoteSelected(), 0.5); + ARDOUR_UI::config()->get_MidiNoteSelected(), 0.5); default: return meter_style_fill_color(_note->velocity(), selected()); |