X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui_common.c;h=6bd54081ba1fbd5f45d0249419e9ec752c04041e;hp=07cab16fe211c740c7a25a484e1fee5271490498;hb=741dc05a35312034c8f1e20c5c08a6755812ba67;hpb=19c9891a4083cf0d5d7ee82b09bed71a1059f71e

diff --git a/gui_common.c b/gui_common.c
index 07cab16f..6bd54081 100644
--- a/gui_common.c
+++ b/gui_common.c
@@ -1,19 +1,36 @@
-#include "para.h"
+/*
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ *
+ * Licensed under the GPL v2. For licencing details see COPYING.
+ */
+
+/** \file gui_common.c Functions used by the guis of paraslash. */
 
-extern const char *status_item_list[NUM_STAT_ITEMS];
 
+#include <sys/types.h>
+#include <dirent.h>
+
+#include "para.h"
+#include "string.h"
+#include "fd.h"
 
 int para_open_audiod_pipe(char *cmd)
 {
 	int fds[3] = {0, 1, 0};
 	pid_t pid;
-	return para_exec_cmdline_pid(&pid, cmd, fds) > 0?
-		fds[1] : -1;
+	int ret = para_exec_cmdline_pid(&pid, cmd, fds);
+	if (ret < 0)
+		return ret;
+	ret = mark_fd_nonblocking(fds[1]);
+	if (ret > 0)
+		return fds[1];
+	close(fds[1]);
+	return ret;
 }
 
-int read_audiod_pipe(int fd, void (*line_handler)(char *) )
+int read_audiod_pipe(int fd, line_handler_t *line_handler)
 {
-	static char buf[STRINGSIZE];
+	static char buf[4096];
 	const ssize_t bufsize = sizeof(buf) - 1;
 	static ssize_t loaded;
 	ssize_t ret;
@@ -24,7 +41,7 @@ int read_audiod_pipe(int fd, void (*line_handler)(char *) )
 	if (ret > 0) {
 		loaded += ret;
 		buf[loaded] = '\0';
-		loaded = for_each_line(buf, loaded, line_handler);
+		loaded = for_each_line(buf, loaded, line_handler, NULL);
 	}
 	return ret;
 }