bringed back the loop

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index a3b6b6a..441c517 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -33,7 +33,6 @@ struct arg {
        const char *args;
 };
 
        const char *args;
 };
 

-static void setstatus(const char *);

 static char *smprintf(const char *, ...);
 static char *battery_perc(const char *);
 static char *cpu_perc(void);
 static char *smprintf(const char *, ...);
 static char *battery_perc(const char *);
 static char *cpu_perc(void);


@@ -64,14 +63,6 @@ static Display *dpy;
 
 #include "config.h"
 
 
 #include "config.h"
 

-static void
-setstatus(const char *str)
-{
-       /* set WM_NAME via X11 */
-       XStoreName(dpy, DefaultRootWindow(dpy), str);
-       XSync(dpy, False);
-}
-

 static char *
 smprintf(const char *fmt, ...)
 {
 static char *
 smprintf(const char *fmt, ...)
 {


@@ -156,7 +147,6 @@ cpu_perc(void)
        fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
        fclose(fp);
 
        fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
        fclose(fp);
 

-       /* wait a second (for avg values) */

        sleep(1);
 
        fp = fopen("/proc/stat","r");
        sleep(1);
 
        fp = fopen("/proc/stat","r");


@@ -491,50 +481,37 @@ uid(void)
 }
 
 
 }
 
 

-static char *
-vol_perc(const char *soundcard)
-{
-       /*
-        * TODO: FIXME: 
-        * https://github.com/drkh5h/slstatus/issues/12
-        */
-       int mute = 0;
-       long vol = 0, max = 0, min = 0;
+static char * 
+vol_perc(const char *snd_card)
+{ /* thanks to botika for this function */
+       long int vol, max, min;

        snd_mixer_t *handle;
        snd_mixer_t *handle;

-       snd_mixer_elem_t *pcm_mixer, *mas_mixer;
-       snd_mixer_selem_id_t *vol_info, *mute_info;
+       snd_mixer_elem_t *elem;
+       snd_mixer_selem_id_t *s_elem;

 
        snd_mixer_open(&handle, 0);
 
        snd_mixer_open(&handle, 0);

-       snd_mixer_attach(handle, soundcard);
+       snd_mixer_attach(handle, snd_card);

        snd_mixer_selem_register(handle, NULL, NULL);
        snd_mixer_load(handle);
        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, "Master");
+       elem = snd_mixer_find_selem(handle, s_elem);

 
 

-       snd_mixer_selem_id_malloc(&vol_info);
-       snd_mixer_selem_id_malloc(&mute_info);
-       if (vol_info == NULL || mute_info == NULL) {
-               fprintf(stderr, "Could not get alsa volume.\n");
+       if (elem == NULL) {
+               snd_mixer_selem_id_free(s_elem);
+               snd_mixer_close(handle);
+               perror("alsa error: ");

                return smprintf(UNKNOWN_STR);
        }
                return smprintf(UNKNOWN_STR);
        }

-       snd_mixer_selem_id_set_name(vol_info, ALSA_CHANNEL);
-       snd_mixer_selem_id_set_name(mute_info, ALSA_CHANNEL);
-       pcm_mixer = snd_mixer_find_selem(handle, vol_info);
-       mas_mixer = snd_mixer_find_selem(handle, mute_info);
-
-       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_switch(mas_mixer, SND_MIXER_SCHN_MONO, &mute);
-
-       if (vol_info)
-               snd_mixer_selem_id_free(vol_info);
-       if (mute_info)
-               snd_mixer_selem_id_free(mute_info);
-       if (handle)
-               snd_mixer_close(handle);

 
 

-       if (!mute)
-               return smprintf("mute");
-       else
-               return smprintf("%d%%", (vol * 100) / max);
+       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_id_free(s_elem);
+       snd_mixer_close(handle);
+
+       return smprintf("%d", (vol * 100) / max);

 }
 
 static char *
 }
 
 static char *


@@ -624,11 +601,8 @@ main(void)
        char *res, *element;
        struct arg argument;
 
        char *res, *element;
        struct arg argument;
 

-       dpy = XOpenDisplay(0x0);
-       if (!dpy) {
-               fprintf(stderr, "Cannot open display!\n");
-               exit(1);
-       }
+       stderr = stderr;
+       dpy = XOpenDisplay(NULL);

 
        for (;;) {
                memset(status_string, 0, sizeof(status_string));
 
        for (;;) {
                memset(status_string, 0, sizeof(status_string));


@@ -647,11 +621,11 @@ main(void)
                        free(res);
                        free(element);
                }
                        free(res);
                        free(element);
                }

-
-               setstatus(status_string);
-               sleep(UPDATE_INTERVAL -1);

        }
 
        }
 

+       XStoreName(dpy, DefaultRootWindow(dpy), status_string);
+       XSync(dpy, False);

        XCloseDisplay(dpy);
        XCloseDisplay(dpy);

+

        return 0;
 }
        return 0;
 }