print_volume: don’t return, complete the buffer first

[i3/i3status] / src / print_volume.c

diff --git a/src/print_volume.c b/src/print_volume.c
index 9c69d081673c5c9a9aedc8755298c11c5a09e292..d3a97084554d55c47d391e35f66b44fd591e7828 100644 (file)
--- a/src/print_volume.c
+++ b/src/print_volume.c
@@ -11,7 +11,7 @@
 #include <alloca.h>
 #endif
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__DragonFly__)
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/soundcard.h>
@@ -77,30 +77,30 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
 
        if (!found) {
                if ((hdl = calloc(sizeof(struct mixer_hdl), 1)) == NULL)
-                       return;
+                       goto out;
 
                if ((hdl->device = strdup(device)) == NULL) {
                        free(hdl);
-                       return;
+                       goto out;
                }
 
                if ((hdl->mixer = strdup(mixer)) == NULL) {
                        free(hdl->device);
                        free(hdl);
-                       return;
+                       goto out;
                }
 
                hdl->mixer_idx = mixer_idx;
                snd_mixer_selem_id_malloc(&(hdl->sid));
                if (hdl->sid == NULL) {
                        free_hdl(hdl);
-                       return;
+                       goto out;
                }
 
                if ((err = snd_mixer_open(&(hdl->m), 0)) < 0) {
                        fprintf(stderr, "i3status: ALSA: Cannot open mixer: %s\n", snd_strerror(err));
                        free_hdl(hdl);
-                       return;
+                       goto out;
                }
 
                /* Attach this mixer handle to the given device */
@@ -108,7 +108,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
                        fprintf(stderr, "i3status: ALSA: Cannot attach mixer to device: %s\n", snd_strerror(err));
                        snd_mixer_close(hdl->m);
                        free_hdl(hdl);
-                       return;
+                       goto out;
                }
 
                /* Register this mixer */
@@ -116,14 +116,14 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
                        fprintf(stderr, "i3status: ALSA: snd_mixer_selem_register: %s\n", snd_strerror(err));
                        snd_mixer_close(hdl->m);
                        free_hdl(hdl);
-                       return;
+                       goto out;
                }
 
                if ((err = snd_mixer_load(hdl->m)) < 0) {
                        fprintf(stderr, "i3status: ALSA: snd_mixer_load: %s\n", snd_strerror(err));
                        snd_mixer_close(hdl->m);
                        free_hdl(hdl);
-                       return;
+                       goto out;
                }
 
                /* Find the given mixer */
@@ -134,7 +134,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
                                snd_mixer_selem_id_get_name(hdl->sid), snd_mixer_selem_id_get_index(hdl->sid));
                        snd_mixer_close(hdl->m);
                        free_hdl(hdl);
-                       return;
+                       goto out;
                }
 
                /* Get the volume range to convert the volume later */
@@ -157,7 +157,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
                if ((err = snd_mixer_selem_get_playback_switch(hdl->elem, 0, &pbval)) < 0)
                        fprintf (stderr, "i3status: ALSA: playback_switch: %s\n", snd_strerror(err));
                if (!pbval)  {
-                       START_COLOR("color_bad");
+                       START_COLOR("color_degraded");
                        avg = 0;
                }
        }
@@ -174,17 +174,33 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
                }
        }
 #endif
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
-        char mixerpath[] = "/dev/mixer";
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+        char *mixerpath;
+        char defaultmixer[] = "/dev/mixer";
         int mixfd, vol, devmask = 0;
+        pbval = 1;
+
+        if (mixer_idx > 0)
+                asprintf(&mixerpath, "/dev/mixer%d", mixer_idx);
+        else
+                mixerpath = defaultmixer;
 
         if ((mixfd = open(mixerpath, O_RDWR)) < 0)
                 return;
+
+        if (mixer_idx > 0)
+                free(mixerpath);
+
         if (ioctl(mixfd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1)
                 return;
         if (ioctl(mixfd, MIXER_READ(0),&vol) == -1)
                 return;
 
+        if (((vol & 0x7f) == 0) && (((vol >> 8) & 0x7f) == 0)) {
+                START_COLOR("color_degraded");
+                pbval = 0;
+        }
+
         const char *walk = fmt;
         for (; *walk != '\0'; walk++) {
                 if (*walk != '%') {
@@ -199,6 +215,7 @@ void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *
         close(mixfd);
 #endif
 
+out:
         *outwalk = '\0';
         OUTPUT_FULL_TEXT(buffer);