diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2018-07-05 14:56:56 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2018-07-05 14:56:56 -0400 |
commit | 44c40bc06529c4c1b6a3dca6fec96f1515f19fc9 (patch) | |
tree | 7ed050f78ca4d4355557601a866da5cb7a0c6957 /gtk2_ardour/note_base.h | |
parent | b4b2fbb6edc4874375a7e1d14b625557fd4c9ce6 (diff) |
use MIDI meter colors (themeable) to show MIDI note velocity.
Selected notes no longer show the selected color for fill, following Alex
Mitchell's proof-of-concept patch that showed it was easier to see what you're
doing when the fill color shows velocity and we just use outline for selection
status.
Diffstat (limited to 'gtk2_ardour/note_base.h')
-rw-r--r-- | gtk2_ardour/note_base.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/gtk2_ardour/note_base.h b/gtk2_ardour/note_base.h index ebc00cbfa4..2a3612579d 100644 --- a/gtk2_ardour/note_base.h +++ b/gtk2_ardour/note_base.h @@ -103,15 +103,7 @@ public: static void set_colors (); - inline static uint32_t meter_style_fill_color(uint8_t vel, bool selected) { - if (selected) { - return _selected_mod_col; - } else if (vel < 64) { - return UINT_INTERPOLATE(_min_col, _mid_col, (vel / (double)63.0)); - } else { - return UINT_INTERPOLATE(_mid_col, _max_col, ((vel - 64) / (double)63.0)); - } - } + static uint32_t meter_style_fill_color(uint8_t vel, bool selected); /// calculate outline colors from fill colors of notes inline static uint32_t calculate_outline(uint32_t color, bool selected=false) { |