Fixed alsa function + datetime function
This commit is contained in:
parent
f6f0c895ce
commit
9078fb351d
2 changed files with 28 additions and 7 deletions
34
slstatus.c
34
slstatus.c
|
@ -150,6 +150,10 @@ datetime(const char *timeformat)
|
||||||
time_t tm;
|
time_t tm;
|
||||||
size_t bufsize = 64;
|
size_t bufsize = 64;
|
||||||
char *buf = malloc(bufsize);
|
char *buf = malloc(bufsize);
|
||||||
|
if (buf == NULL) {
|
||||||
|
fprintf(stderr, "Failed to get date/time");
|
||||||
|
return smprintf("n/a");
|
||||||
|
}
|
||||||
|
|
||||||
/* get time in format */
|
/* get time in format */
|
||||||
time(&tm);
|
time(&tm);
|
||||||
|
@ -544,37 +548,53 @@ vol_perc(const char *soundcard)
|
||||||
{
|
{
|
||||||
int mute = 0;
|
int mute = 0;
|
||||||
long vol = 0, max = 0, min = 0;
|
long vol = 0, max = 0, min = 0;
|
||||||
|
|
||||||
/* get volume from alsa */
|
|
||||||
snd_mixer_t *handle;
|
snd_mixer_t *handle;
|
||||||
snd_mixer_elem_t *pcm_mixer, *mas_mixer;
|
snd_mixer_elem_t *pcm_mixer, *mas_mixer;
|
||||||
snd_mixer_selem_id_t *vol_info, *mute_info;
|
snd_mixer_selem_id_t *vol_info, *mute_info;
|
||||||
|
|
||||||
|
/* open everything */
|
||||||
snd_mixer_open(&handle, 0);
|
snd_mixer_open(&handle, 0);
|
||||||
snd_mixer_attach(handle, soundcard);
|
snd_mixer_attach(handle, soundcard);
|
||||||
snd_mixer_selem_register(handle, NULL, NULL);
|
snd_mixer_selem_register(handle, NULL, NULL);
|
||||||
snd_mixer_load(handle);
|
snd_mixer_load(handle);
|
||||||
|
|
||||||
|
/* prepare everything */
|
||||||
snd_mixer_selem_id_malloc(&vol_info);
|
snd_mixer_selem_id_malloc(&vol_info);
|
||||||
snd_mixer_selem_id_malloc(&mute_info);
|
snd_mixer_selem_id_malloc(&mute_info);
|
||||||
|
/* check */
|
||||||
|
if (vol_info == NULL || mute_info == NULL) {
|
||||||
|
fprintf(stderr, "Could not get alsa volume");
|
||||||
|
return smprintf("n/a");
|
||||||
|
}
|
||||||
snd_mixer_selem_id_set_name(vol_info, channel);
|
snd_mixer_selem_id_set_name(vol_info, channel);
|
||||||
snd_mixer_selem_id_set_name(mute_info, channel);
|
snd_mixer_selem_id_set_name(mute_info, channel);
|
||||||
pcm_mixer = snd_mixer_find_selem(handle, vol_info);
|
pcm_mixer = snd_mixer_find_selem(handle, vol_info);
|
||||||
mas_mixer = snd_mixer_find_selem(handle, mute_info);
|
mas_mixer = snd_mixer_find_selem(handle, mute_info);
|
||||||
|
|
||||||
|
/* get the info */
|
||||||
snd_mixer_selem_get_playback_volume_range((snd_mixer_elem_t *)pcm_mixer, &min, &max);
|
snd_mixer_selem_get_playback_volume_range((snd_mixer_elem_t *)pcm_mixer, &min, &max);
|
||||||
snd_mixer_selem_get_playback_volume((snd_mixer_elem_t *)pcm_mixer, SND_MIXER_SCHN_MONO, &vol);
|
snd_mixer_selem_get_playback_volume((snd_mixer_elem_t *)pcm_mixer, SND_MIXER_SCHN_MONO, &vol);
|
||||||
snd_mixer_selem_get_playback_switch(mas_mixer, SND_MIXER_SCHN_MONO, &mute);
|
snd_mixer_selem_get_playback_switch(mas_mixer, SND_MIXER_SCHN_MONO, &mute);
|
||||||
if (vol_info)
|
|
||||||
|
/* clean up */
|
||||||
|
if (vol_info) {
|
||||||
snd_mixer_selem_id_free(vol_info);
|
snd_mixer_selem_id_free(vol_info);
|
||||||
if (mute_info)
|
}
|
||||||
|
if (mute_info) {
|
||||||
snd_mixer_selem_id_free(mute_info);
|
snd_mixer_selem_id_free(mute_info);
|
||||||
if (handle)
|
}
|
||||||
|
if (handle) {
|
||||||
snd_mixer_close(handle);
|
snd_mixer_close(handle);
|
||||||
|
}
|
||||||
|
|
||||||
/* return the string (mute) */
|
/* return the string (mute) */
|
||||||
if (!mute)
|
if (!mute) {
|
||||||
return smprintf("mute");
|
return smprintf("mute");
|
||||||
else
|
}
|
||||||
|
else {
|
||||||
return smprintf("%d%%", (vol * 100) / max);
|
return smprintf("%d%%", (vol * 100) / max);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* wifi percentage */
|
/* wifi percentage */
|
||||||
char *
|
char *
|
||||||
|
|
|
@ -29,6 +29,7 @@ char *ram_free(const char *);
|
||||||
char *ram_perc(const char *);
|
char *ram_perc(const char *);
|
||||||
char *ram_used(const char *);
|
char *ram_used(const char *);
|
||||||
char *ram_total(const char *);
|
char *ram_total(const char *);
|
||||||
|
char *run_command(const char *);
|
||||||
char *temp(const char *);
|
char *temp(const char *);
|
||||||
char *uid(const char*);
|
char *uid(const char*);
|
||||||
char *username(const char*);
|
char *username(const char*);
|
||||||
|
|
Loading…
Reference in a new issue