X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=933729a26c9e530570a8bf01418f6e839fcf535d;hp=c335250fee77daccc61868963e6135a220337610;hb=29be20dfd84779aeebfc3e1418cb4796e7b91dd6;hpb=8d7bdabd22ed7750086ca660754d8d881dae3832

diff --git a/gui.c b/gui.c
index c335250f..933729a2 100644
--- a/gui.c
+++ b/gui.c
@@ -4,7 +4,7 @@
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file gui.c ncurses-based interface for paraslash */
+/** \file gui.c Curses-based interface for paraslash. */
 
 #include <signal.h>
 #include <sys/types.h>
@@ -12,9 +12,9 @@
 #include "gui.cmdline.h"
 #include "para.h"
 #include "gui.h"
+#include "string.h"
 #include <curses.h>
 #include "ringbuffer.h"
-#include "gui_common.h"
 #include "fd.h"
 #include "error.h"
 #include "list.h"
@@ -29,8 +29,6 @@ static char *stat_content[NUM_STAT_ITEMS];
 
 static int signal_pipe;
 
-static void finish(int sig);
-
 static struct win_data {
 	WINDOW *win;
 	NCURSES_SIZE_T begx;
@@ -191,6 +189,38 @@ struct gui_command command_list[] = {
 	}
 };
 
+static int para_open_audiod_pipe(char *cmd)
+{
+	int fds[3] = {0, 1, 0};
+	pid_t pid;
+	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;
+}
+
+static int read_audiod_pipe(int fd, line_handler_t *line_handler)
+{
+	static char buf[4096];
+	const ssize_t bufsize = sizeof(buf) - 1;
+	static ssize_t loaded;
+	ssize_t ret;
+
+	if (loaded >= bufsize)
+		loaded = 0;
+	ret = read(fd, buf + loaded, bufsize - loaded);
+	if (ret > 0) {
+		loaded += ret;
+		buf[loaded] = '\0';
+		loaded = for_each_line(buf, loaded, line_handler, NULL);
+	}
+	return ret;
+}
+
 static int find_cmd_byname(char *name)
 {
 	int i;