mirror of
https://github.com/alsa-project/alsa-utils
synced 2024-12-22 13:06:32 +01:00
alsamixer: rename attr to ch
Rename the attr variable because it contains not only the character's attributes but also the character itself. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
This commit is contained in:
parent
6788885405
commit
7a3e59cbc5
1 changed files with 8 additions and 9 deletions
|
@ -469,24 +469,23 @@ static void display_control(unsigned int control_index)
|
||||||
bar_height = ((volumes[c] - min) * volume_height +
|
bar_height = ((volumes[c] - min) * volume_height +
|
||||||
max - min - 1) / (max - min);
|
max - min - 1) / (max - min);
|
||||||
for (i = 0; i < volume_height; ++i) {
|
for (i = 0; i < volume_height; ++i) {
|
||||||
int attr;
|
chtype ch;
|
||||||
if (i + 1 > bar_height)
|
if (i + 1 > bar_height)
|
||||||
attr = ' ' |
|
ch = ' ' | (control->flags & IS_ACTIVE ?
|
||||||
(control->flags & IS_ACTIVE ?
|
attr_ctl_frame : 0);
|
||||||
attr_ctl_frame : 0);
|
|
||||||
else {
|
else {
|
||||||
attr = ACS_CKBOARD;
|
ch = ACS_CKBOARD;
|
||||||
#ifdef TRICOLOR_VOLUME_BAR
|
#ifdef TRICOLOR_VOLUME_BAR
|
||||||
if (i > volume_height * 8 / 10)
|
if (i > volume_height * 8 / 10)
|
||||||
attr |= attr_ctl_bar_hi;
|
ch |= attr_ctl_bar_hi;
|
||||||
else if (i > volume_height * 4 / 10)
|
else if (i > volume_height * 4 / 10)
|
||||||
attr |= attr_ctl_bar_mi;
|
ch |= attr_ctl_bar_mi;
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
attr |= attr_ctl_bar_lo;
|
ch |= attr_ctl_bar_lo;
|
||||||
}
|
}
|
||||||
mvwaddch(mixer_widget.window, base_y - i - 1,
|
mvwaddch(mixer_widget.window, base_y - i - 1,
|
||||||
frame_left + c + 1, attr);
|
frame_left + c + 1, ch);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (control->flags & IS_ACTIVE)
|
if (control->flags & IS_ACTIVE)
|
||||||
|
|
Loading…
Reference in a new issue