From 12b1bfa9b8485de88b0bda82821c021aee197673 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 25 Mar 2012 20:55:55 +0200
Subject: Properly output JSON with libyajl

---
 src/print_volume.c | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'src/print_volume.c')

diff --git a/src/print_volume.c b/src/print_volume.c
index 85b6176..5c34c3e 100644
--- a/src/print_volume.c
+++ b/src/print_volume.c
@@ -41,10 +41,16 @@ static void free_hdl(struct mixer_hdl *hdl) {
 }
 #endif
 
-void print_volume(const char *fmt, const char *device, const char *mixer, int mixer_idx) {
-/* Printing volume only works with ALSA at the moment */
-        if (output_format == O_I3BAR)
-                printf("{\"name\":\"volume\", \"instance\": \"%s.%s.%d\", \"full_text\":\"", device, mixer, mixer_idx);
+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 */
@@ -149,11 +155,11 @@ 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");
 		}
 	}
@@ -172,16 +178,17 @@ 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%%", vol & 0x7f);
+                        outwalk += sprintf(outwalk, "%d%%", vol & 0x7f);
                         walk += strlen("volume");
                 }
         }
         close(mixfd);
 #endif
-        if (output_format == O_I3BAR)
-                printf("\"}");
+
+        *outwalk = '\0';
+        OUTPUT_FULL_TEXT(buffer);
 }
-- 
cgit v1.2.3