summaryrefslogtreecommitdiff
path: root/alsamixer
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2009-06-19 08:39:24 +0200
committerClemens Ladisch <clemens@ladisch.de>2009-06-19 08:39:24 +0200
commit7a3e59cbc506d9f3019e0be60dab0fa86c54cd23 (patch)
tree9cb209533fd006f46e5fdef87d7203249060dd72 /alsamixer
parent67888854051291be8503e6e48086c9a3318fd631 (diff)
downloadalsa-utils-7a3e59cbc506d9f3019e0be60dab0fa86c54cd23.tar.gz
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>
Diffstat (limited to 'alsamixer')
-rw-r--r--alsamixer/mixer_display.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/alsamixer/mixer_display.c b/alsamixer/mixer_display.c
index d0a0e56..79ed9d6 100644
--- a/alsamixer/mixer_display.c
+++ b/alsamixer/mixer_display.c
@@ -469,24 +469,23 @@ static void display_control(unsigned int control_index)
bar_height = ((volumes[c] - min) * volume_height +
max - min - 1) / (max - min);
for (i = 0; i < volume_height; ++i) {
- int attr;
+ chtype ch;
if (i + 1 > bar_height)
- attr = ' ' |
- (control->flags & IS_ACTIVE ?
- attr_ctl_frame : 0);
+ ch = ' ' | (control->flags & IS_ACTIVE ?
+ attr_ctl_frame : 0);
else {
- attr = ACS_CKBOARD;
+ ch = ACS_CKBOARD;
#ifdef TRICOLOR_VOLUME_BAR
if (i > volume_height * 8 / 10)
- attr |= attr_ctl_bar_hi;
+ ch |= attr_ctl_bar_hi;
else if (i > volume_height * 4 / 10)
- attr |= attr_ctl_bar_mi;
+ ch |= attr_ctl_bar_mi;
else
#endif
- attr |= attr_ctl_bar_lo;
+ ch |= attr_ctl_bar_lo;
}
mvwaddch(mixer_widget.window, base_y - i - 1,
- frame_left + c + 1, attr);
+ frame_left + c + 1, ch);
}
}
if (control->flags & IS_ACTIVE)