summaryrefslogtreecommitdiff
path: root/gtk2_ardour/note_base.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2018-07-05 15:01:55 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2018-07-05 15:01:55 -0400
commit631b8f1b6b82f1c6c71fe5c67179d8cbc2f7775a (patch)
tree25ba836016428898932f29758b6252521775c248 /gtk2_ardour/note_base.cc
parent44c40bc06529c4c1b6a3dca6fec96f1515f19fc9 (diff)
fix interpolation math error
Diffstat (limited to 'gtk2_ardour/note_base.cc')
-rw-r--r--gtk2_ardour/note_base.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/note_base.cc b/gtk2_ardour/note_base.cc
index 52ee88a2d6..8c944c9d55 100644
--- a/gtk2_ardour/note_base.cc
+++ b/gtk2_ardour/note_base.cc
@@ -332,16 +332,16 @@ NoteBase::big_enough_to_trim () const
uint32_t
-NoteBase::meter_style_fill_color(uint8_t vel, bool selected)
+NoteBase::meter_style_fill_color(uint8_t vel, bool /* selected */)
{
if (vel < 32) {
return UINT_INTERPOLATE(UIConfiguration::instance().color ("midi meter color0"), UIConfiguration::instance().color ("midi meter color1"), (vel / 32.0));
} else if (vel < 64) {
return UINT_INTERPOLATE(UIConfiguration::instance().color ("midi meter color2"), UIConfiguration::instance().color ("midi meter color3"), ((vel-32) / 32.0));
} else if (vel < 100) {
- return UINT_INTERPOLATE(UIConfiguration::instance().color ("midi meter color4"), UIConfiguration::instance().color ("midi meter color5"), ((vel-64) / 32.0));
+ return UINT_INTERPOLATE(UIConfiguration::instance().color ("midi meter color4"), UIConfiguration::instance().color ("midi meter color5"), ((vel-64) / 36.0));
} else if (vel < 112) {
- return UINT_INTERPOLATE(UIConfiguration::instance().color ("midi meter color6"), UIConfiguration::instance().color ("midi meter color7"), ((vel-100) / 36.0));
+ return UINT_INTERPOLATE(UIConfiguration::instance().color ("midi meter color6"), UIConfiguration::instance().color ("midi meter color7"), ((vel-100) / 12.0));
} else {
return UINT_INTERPOLATE(UIConfiguration::instance().color ("midi meter color8"), UIConfiguration::instance().color ("midi meter color9"), ((vel-112) / 17.0));
}