simplified vol_perc() (and with that config.def.h is super clean)

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index bf3c826..1b45f64 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -98,36 +98,19 @@ smprintf(const char *fmt, ...)
 static char *
 battery_perc(const char *battery)
 {
-       int now, full;
+       int perc;
        FILE *fp;
 
-       ccat(3, "/sys/class/power_supply/", battery, "/energy_now");
-       fp = fopen(concat, "r");
-       if (fp == NULL) {
-               ccat(4, "/sys/class/power_supply/", battery, "/charge_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(3, "/sys/class/power_supply/", battery, "/energy_full");
+       ccat(3, "/sys/class/power_supply/", battery, "/capacity");
        fp = fopen(concat, "r");
        if (fp == NULL) {
-               ccat(4, "/sys/class/power_supply/", battery, "/charge_full");
-               fp = fopen(concat, "r");
-               if (fp == NULL) {
-                       warn("Error opening battery file: %s", concat);
-                       return smprintf(UNKNOWN_STR);
-               }
+               warn("Error opening battery file: %s", concat);
+               return smprintf(UNKNOWN_STR);
        }
-       fscanf(fp, "%i", &full);
+       fscanf(fp, "%i", &perc);
        fclose(fp);
 
-       return smprintf("%d%%", now / (full / 100));
+       return smprintf("%d%%", perc);
 }
 
 static char *
@@ -476,7 +459,7 @@ uid(void)
 
 
 static char *
-vol_perc(const char *snd_card)
+vol_perc(const char *soundcard)
 { /* FIX THIS SHIT! */
        long int vol, max, min;
        snd_mixer_t *handle;
@@ -488,7 +471,7 @@ vol_perc(const char *snd_card)
        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) {