From: Aaron Marcher <info@nulltime.net>
Date: Thu, 13 Oct 2016 10:15:18 +0000 (+0200)
Subject: Merge pull request #24 from jodizzle/feat/mute
X-Git-Url: https://git.xinqibao.xyz/slstatus.git/commitdiff_plain/59ed3b6d8d594e00d72ecd3beadb512f797146ee?hp=97c745e10e3f0710db4b2c84340171f915f2f6c6

Merge pull request #24 from jodizzle/feat/mute

Restore "mute" message
---

diff --git a/slstatus.c b/slstatus.c
index d442776..efdc9b0 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -472,6 +472,7 @@ uid(void)
 static char *
 vol_perc(const char *card)
 {
+	int mute;
 	long int vol, max, min;
 	snd_mixer_t *handle;
 	snd_mixer_elem_t *elem;
@@ -495,11 +496,14 @@ vol_perc(const char *card)
 	snd_mixer_handle_events(handle);
 	snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
 	snd_mixer_selem_get_playback_volume(elem, 0, &vol);
+	snd_mixer_selem_get_playback_switch(elem, 0, &mute);
 
 	snd_mixer_selem_id_free(s_elem);
 	snd_mixer_close(handle);
 
-	if (max == 0)
+	if (!mute)
+		return smprintf("mute");
+	else if (max == 0)
 		return smprintf("0%%");
 	else
 		return smprintf("%lu%%", ((uint_fast16_t)(vol * 100) / max));