fixed vol_perc() typo and added % sign again

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 991334a..fa91cce 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -98,33 +98,18 @@ smprintf(const char *fmt, ...)
 static char *
 battery_perc(const char *battery)
 {
-       int now, full, perc;
+       int perc;
        FILE *fp;
 
-       ccat(4, BATTERY_PATH, battery, "/", BATTERY_NOW);
-
-       fp = fopen(concat, "r");
-       if (fp == NULL) {
-               warn("Error opening battery file: %s", concat);
-               return smprintf(UNKNOWN_STR);
-       }
-
-       fscanf(fp, "%i", &now);
-       fclose(fp);
-
-       ccat(4, BATTERY_PATH, battery, "/", BATTERY_FULL);
-
+       ccat(3, "/sys/class/power_supply/", battery, "/capacity");
        fp = fopen(concat, "r");
        if (fp == NULL) {
                warn("Error opening battery file: %s", concat);
                return smprintf(UNKNOWN_STR);
        }
-
-       fscanf(fp, "%i", &full);
+       fscanf(fp, "%i", &perc);
        fclose(fp);
 
-       perc = now / (full / 100);
-
        return smprintf("%d%%", perc);
 }
 
@@ -474,25 +459,25 @@ uid(void)
 
 
 static char *
-vol_perc(const char *snd_card)
-{ /* FIX THIS SHIT! */
+vol_perc(const char *soundcard)
+{
        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, snd_card);
+       snd_mixer_attach(handle, soundcard);
        snd_mixer_selem_register(handle, NULL, NULL);
        snd_mixer_load(handle);
        snd_mixer_selem_id_malloc(&s_elem);
-       snd_mixer_selem_id_set_name(s_elem, ALSA_CHANNEL);
+       snd_mixer_selem_id_set_name(s_elem, "Master");
        elem = snd_mixer_find_selem(handle, s_elem);
 
        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);
        }
 
@@ -503,7 +488,7 @@ vol_perc(const char *snd_card)
        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 *