Xinqi Bao's Git
projects
/
slstatus.git
/ commitdiff
summary
|
log
|
commit
|
diff
|
tree
raw
|
patch
|
inline
| side by side (from parent 1:
87c1377
)
fixed vol_perc() typo and added % sign again
author
Aaron Marcher <
[email protected]
>
Tue, 13 Sep 2016 19:11:11 +0000
(21:11 +0200)
committer
Aaron Marcher (drkhsh) <
[email protected]
>
Tue, 13 Sep 2016 19:11:11 +0000
(21:11 +0200)
slstatus.c
patch
|
blob
|
history
diff --git
a/slstatus.c
b/slstatus.c
index
1b45f64
..
fa91cce
100644
(file)
--- a/
slstatus.c
+++ b/
slstatus.c
@@
-460,14
+460,14
@@
uid(void)
static char *
vol_perc(const char *soundcard)
static char *
vol_perc(const char *soundcard)
-{
/* FIX THIS SHIT! */
+{
long int vol, max, min;
snd_mixer_t *handle;
snd_mixer_elem_t *elem;
snd_mixer_selem_id_t *s_elem;
snd_mixer_open(&handle, 0);
long int vol, max, min;
snd_mixer_t *handle;
snd_mixer_elem_t *elem;
snd_mixer_selem_id_t *s_elem;
snd_mixer_open(&handle, 0);
- snd_mixer_attach(handle, s
nd_
card);
+ snd_mixer_attach(handle, s
ound
card);
snd_mixer_selem_register(handle, NULL, NULL);
snd_mixer_load(handle);
snd_mixer_selem_id_malloc(&s_elem);
snd_mixer_selem_register(handle, NULL, NULL);
snd_mixer_load(handle);
snd_mixer_selem_id_malloc(&s_elem);
@@
-477,7
+477,7
@@
vol_perc(const char *soundcard)
if (elem == NULL) {
snd_mixer_selem_id_free(s_elem);
snd_mixer_close(handle);
if (elem == NULL) {
snd_mixer_selem_id_free(s_elem);
snd_mixer_close(handle);
- warn("
error: ALSA"
);
+ warn("
Failed to get volume percentage for: %s.", soundcard
);
return smprintf(UNKNOWN_STR);
}
return smprintf(UNKNOWN_STR);
}
@@
-488,7
+488,7
@@
vol_perc(const char *soundcard)
snd_mixer_selem_id_free(s_elem);
snd_mixer_close(handle);
snd_mixer_selem_id_free(s_elem);
snd_mixer_close(handle);
- return smprintf("%d", ((uint_fast16_t)(vol * 100) / max));
+ return smprintf("%d
%%
", ((uint_fast16_t)(vol * 100) / max));
}
static char *
}
static char *