* Please see COPYING for details
*
* Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
- * Copyright (c) 2005-2009 Brenden Matthews, Philip Kovacs, et. al.
+ * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al.
* (see AUTHORS)
* All rights reserved.
*
}
static int mixer_get_avg (int i)
{
- long val;
+ long val;
- snd_mixer_handle_events (data.mixer);
- snd_mixer_selem_get_playback_volume (data.elem, 0, &val);
- return (int) val;
+ snd_mixer_handle_events (data.mixer);
+ snd_mixer_selem_get_playback_volume (data.elem, 0, &val);
+ if(data.vol_max != 100) {
+ float avgf = ((float)val / data.vol_max) * 100;
+ int avg = (int)avgf;
+ return (avgf - avg < 0.5) ? avg : avg + 1;
+ }
+ return (int) val;
}
static int mixer_get_left (int i)
{
return !mixer_get(i);
}
-#define mixer_to_255(i, x) x
+#define mixer_to_255(i, x) x * 2.55
#endif /* MIXER_IS_ALSA */
void parse_mixer_arg(struct text_object *obj, const char *arg)
return 1;
}
-#ifdef X11
void scan_mixer_bar(struct text_object *obj, const char *arg)
{
char buf1[64];
{
print_mixer_bar_chan(obj, 1, p, p_max_size);
}
-
-#endif /* X11 */