imported a new vol_perc() function, this should fix #12 (UNTESTED)
This commit is contained in:
parent
9fa858daea
commit
52d19f955e
49
slstatus.c
49
slstatus.c
@ -482,49 +482,36 @@ uid(void)
|
|||||||
|
|
||||||
|
|
||||||
static char *
|
static char *
|
||||||
vol_perc(const char *soundcard)
|
vol_perc(const char *snd_card)
|
||||||
{
|
{ /* thanks to botika for this function */
|
||||||
/*
|
long int vol, max, min;
|
||||||
* TODO: FIXME:
|
|
||||||
* https://github.com/drkh5h/slstatus/issues/12
|
|
||||||
*/
|
|
||||||
int mute = 0;
|
|
||||||
long vol = 0, max = 0, min = 0;
|
|
||||||
snd_mixer_t *handle;
|
snd_mixer_t *handle;
|
||||||
snd_mixer_elem_t *pcm_mixer, *mas_mixer;
|
snd_mixer_elem_t *elem;
|
||||||
snd_mixer_selem_id_t *vol_info, *mute_info;
|
snd_mixer_selem_id_t *s_elem;
|
||||||
|
|
||||||
snd_mixer_open(&handle, 0);
|
snd_mixer_open(&handle, 0);
|
||||||
snd_mixer_attach(handle, soundcard);
|
snd_mixer_attach(handle, snd_card);
|
||||||
snd_mixer_selem_register(handle, NULL, NULL);
|
snd_mixer_selem_register(handle, NULL, NULL);
|
||||||
snd_mixer_load(handle);
|
snd_mixer_load(handle);
|
||||||
|
snd_mixer_selem_id_malloc(&s_elem);
|
||||||
|
snd_mixer_selem_id_set_name(s_elem, "Master");
|
||||||
|
elem = snd_mixer_find_selem(handle, s_elem);
|
||||||
|
|
||||||
snd_mixer_selem_id_malloc(&vol_info);
|
if (elem == NULL) {
|
||||||
snd_mixer_selem_id_malloc(&mute_info);
|
snd_mixer_selem_id_free(s_elem);
|
||||||
if (vol_info == NULL || mute_info == NULL) {
|
snd_mixer_close(handle);
|
||||||
fprintf(stderr, "Could not get alsa volume.\n");
|
perror("alsa error: ");
|
||||||
return smprintf(UNKNOWN_STR);
|
return smprintf(UNKNOWN_STR);
|
||||||
}
|
}
|
||||||
snd_mixer_selem_id_set_name(vol_info, ALSA_CHANNEL);
|
|
||||||
snd_mixer_selem_id_set_name(mute_info, ALSA_CHANNEL);
|
|
||||||
pcm_mixer = snd_mixer_find_selem(handle, vol_info);
|
|
||||||
mas_mixer = snd_mixer_find_selem(handle, mute_info);
|
|
||||||
|
|
||||||
snd_mixer_selem_get_playback_volume_range((snd_mixer_elem_t *)pcm_mixer, &min, &max);
|
snd_mixer_handle_events(handle);
|
||||||
snd_mixer_selem_get_playback_volume((snd_mixer_elem_t *)pcm_mixer, SND_MIXER_SCHN_MONO, &vol);
|
snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
|
||||||
snd_mixer_selem_get_playback_switch(mas_mixer, SND_MIXER_SCHN_MONO, &mute);
|
snd_mixer_selem_get_playback_volume(elem, 0, &vol);
|
||||||
|
|
||||||
if (vol_info)
|
snd_mixer_selem_id_free(s_elem);
|
||||||
snd_mixer_selem_id_free(vol_info);
|
|
||||||
if (mute_info)
|
|
||||||
snd_mixer_selem_id_free(mute_info);
|
|
||||||
if (handle)
|
|
||||||
snd_mixer_close(handle);
|
snd_mixer_close(handle);
|
||||||
|
|
||||||
if (!mute)
|
return smprintf("%d", (vol * 100) / max);
|
||||||
return smprintf("mute");
|
|
||||||
else
|
|
||||||
return smprintf("%d%%", (vol * 100) / max);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *
|
static char *
|
||||||
|
Loading…
Reference in New Issue
Block a user