X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fprint_volume.c;h=dbf5e1ff02022f521f05c3cc4dd428911593fb07;hb=296eb5e7063b4051927f2e2bf94e1034bf64f60c;hp=0eca0c0a2bbae34d432a2c2737bbceff201a7ba6;hpb=eb46963d4c88a75f1ac336275daf3d0d72a904ba;p=i3%2Fi3status

diff --git a/src/print_volume.c b/src/print_volume.c
index 0eca0c0..dbf5e1f 100644
--- a/src/print_volume.c
+++ b/src/print_volume.c
@@ -3,12 +3,26 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <yajl/yajl_gen.h>
+#include <yajl/yajl_version.h>
 
 #ifdef LINUX
 #include <alsa/asoundlib.h>
 #include <alloca.h>
 #endif
 
+#ifdef __FreeBSD__
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/soundcard.h>
+#endif
+
+#ifdef __OpenBSD__
+#include <fcntl.h>
+#include <unistd.h>
+#include <soundcard.h>
+#endif
+
 #include "i3status.h"
 #include "queue.h"
 
@@ -27,19 +41,25 @@ struct mixer_hdl {
 };
 
 TAILQ_HEAD(handles_head, mixer_hdl) cached = TAILQ_HEAD_INITIALIZER(cached);
-#endif
 
 static void free_hdl(struct mixer_hdl *hdl) {
 	free(hdl->device);
 	free(hdl->mixer);
 	free(hdl);
 }
-
-void print_volume(const char *fmt, const char *device, const char *mixer, int mixer_idx) {
-/* Printing volume only works with ALSA at the moment */
-#ifndef LINUX
-	return;
 #endif
+
+void print_volume(yajl_gen json_gen, char *buffer, const char *fmt, const char *device, const char *mixer, int mixer_idx) {
+        char *outwalk = buffer;
+
+        /* Printing volume only works with ALSA at the moment */
+        if (output_format == O_I3BAR) {
+                char *instance;
+                asprintf(&instance, "%s.%s.%d", device, mixer, mixer_idx);
+                INSTANCE(instance);
+                free(instance);
+        }
+#ifdef LINUX
 	/* Check if we already opened the mixer and get the handle
 	 * from cache if so */
 	bool found = false;
@@ -77,14 +97,14 @@ void print_volume(const char *fmt, const char *device, const char *mixer, int mi
 		}
 
 		if ((err = snd_mixer_open(&(hdl->m), 0)) < 0) {
-			fprintf(stderr, "ALSA: Cannot open mixer: %s\n", snd_strerror(err));
+			fprintf(stderr, "i3status: ALSA: Cannot open mixer: %s\n", snd_strerror(err));
 			free_hdl(hdl);
 			return;
 		}
 
 		/* Attach this mixer handle to the given device */
 		if ((err = snd_mixer_attach(hdl->m, device)) < 0) {
-			fprintf(stderr, "ALSA: Cannot attach mixer to device: %s\n", snd_strerror(err));
+			fprintf(stderr, "i3status: ALSA: Cannot attach mixer to device: %s\n", snd_strerror(err));
 			snd_mixer_close(hdl->m);
 			free_hdl(hdl);
 			return;
@@ -92,14 +112,14 @@ void print_volume(const char *fmt, const char *device, const char *mixer, int mi
 
 		/* Register this mixer */
 		if ((err = snd_mixer_selem_register(hdl->m, NULL, NULL)) < 0) {
-			fprintf(stderr, "ALSA: snd_mixer_selem_register: %s\n", snd_strerror(err));
+			fprintf(stderr, "i3status: ALSA: snd_mixer_selem_register: %s\n", snd_strerror(err));
 			snd_mixer_close(hdl->m);
 			free_hdl(hdl);
 			return;
 		}
 
 		if ((err = snd_mixer_load(hdl->m)) < 0) {
-			fprintf(stderr, "ALSA: snd_mixer_load: %s\n", snd_strerror(err));
+			fprintf(stderr, "i3status: ALSA: snd_mixer_load: %s\n", snd_strerror(err));
 			snd_mixer_close(hdl->m);
 			free_hdl(hdl);
 			return;
@@ -109,7 +129,7 @@ void print_volume(const char *fmt, const char *device, const char *mixer, int mi
 		snd_mixer_selem_id_set_index(hdl->sid, mixer_idx);
 		snd_mixer_selem_id_set_name(hdl->sid, mixer);
 		if (!(hdl->elem = snd_mixer_find_selem(hdl->m, hdl->sid))) {
-			fprintf(stderr, "ALSA: Cannot find mixer %s (index %i)\n",
+			fprintf(stderr, "i3status: ALSA: Cannot find mixer %s (index %i)\n",
 				snd_mixer_selem_id_get_name(hdl->sid), snd_mixer_selem_id_get_index(hdl->sid));
 			snd_mixer_close(hdl->m);
 			free_hdl(hdl);
@@ -135,7 +155,7 @@ void print_volume(const char *fmt, const char *device, const char *mixer, int mi
 	if (snd_mixer_selem_has_playback_switch(hdl->elem)) {
 		int pbval;
 		if ((err = snd_mixer_selem_get_playback_switch(hdl->elem, 0, &pbval)) < 0)
-			fprintf (stderr, "ALSA: playback_switch: %s\n", snd_strerror(err));
+			fprintf (stderr, "i3status: ALSA: playback_switch: %s\n", snd_strerror(err));
 		if (!pbval)
 			avg = 0;
 	}
@@ -143,12 +163,40 @@ void print_volume(const char *fmt, const char *device, const char *mixer, int mi
 	const char *walk = fmt;
 	for (; *walk != '\0'; walk++) {
 		if (*walk != '%') {
-			putchar(*walk);
+                        *(outwalk++) = *walk;
 			continue;
 		}
 		if (BEGINS_WITH(walk+1, "volume")) {
-			printf("%d%%", avg);
+			outwalk += sprintf(outwalk, "%d%%", avg);
 			walk += strlen("volume");
 		}
 	}
+#endif
+#if defined(__FreeBSD__) || defined(__OpenBSD__)
+        char mixerpath[] = "/dev/mixer";
+        int mixfd, vol, devmask = 0;
+
+        if ((mixfd = open(mixerpath, O_RDWR)) < 0)
+                return;
+        if (ioctl(mixfd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1)
+                return;
+        if (ioctl(mixfd, MIXER_READ(0),&vol) == -1)
+                return;
+
+        const char *walk = fmt;
+        for (; *walk != '\0'; walk++) {
+                if (*walk != '%') {
+                        *(outwalk++) = *walk;
+                        continue;
+                }
+                if (BEGINS_WITH(walk+1, "volume")) {
+                        outwalk += sprintf(outwalk, "%d%%", vol & 0x7f);
+                        walk += strlen("volume");
+                }
+        }
+        close(mixfd);
+#endif
+
+        *outwalk = '\0';
+        OUTPUT_FULL_TEXT(buffer);
 }