smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 21:55:43 +01:00
Code Issues Projects Releases Wiki Activity

push2: fix color map store/lookup for rgba<=>color index mapping

Browse source
This commit is contained in:
Paul Davis 2016-09-21 23:08:30 -05:00
parent 9e1c7ccaf8
commit 0add64d4ab
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/surfaces/push2/push2.cc
View file

@ -1513,16 +1513,16 @@ Push2::button_by_id (ButtonID bid)
}
uint8_t
Push2::get_color_index (uint32_t rgb)
Push2::get_color_index (ArdourCanvas::Color rgba)
{
ColorMap::iterator i = color_map.find (rgb);
ColorMap::iterator i = color_map.find (rgba);
if (i != color_map.end()) {
return i->second;
}
int r, g, b, a;
UINT_TO_RGBA (rgb, &r, &g, &b, &a);
UINT_TO_RGBA (rgba, &r, &g, &b, &a);
int w = 204; /* not sure where/when we should get this value */
/* get a free index */
@ -1555,7 +1555,7 @@ Push2::get_color_index (uint32_t rgb)
write (palette_msg);
write (update_pallette_msg);
color_map[index] = rgb;
color_map[rgba] = index;
return index;
}