From: Andre Noll <maan@systemlinux.org>
Date: Thu, 6 May 2010 04:57:46 +0000 (+0200)
Subject: gui: Rename audiod_pipe to stat_pipe.
X-Git-Tag: v0.4.3~25^2~3
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=b40c89e243f10560f1c8e491239ab8c07dfb7dc5;p=paraslash.git

gui: Rename audiod_pipe to stat_pipe.

It is not always an audiod command that is executed.
---

diff --git a/gui.c b/gui.c
index 31987c46..8e2dee1c 100644
--- a/gui.c
+++ b/gui.c
@@ -54,7 +54,7 @@ static int cmd_died, curses_active;
 static pid_t cmd_pid;
 
 static int command_pipe = -1;
-static int audiod_pipe = -1;
+static int stat_pipe = -1;
 static struct gui_args_info conf;
 
 enum {GETCH_MODE, COMMAND_MODE, EXTERNAL_MODE};
@@ -191,7 +191,7 @@ static struct gui_command command_list[] = {
 	}
 };
 
-static int para_open_audiod_pipe(char *cmd)
+static int para_open_stat_pipe(char *cmd)
 {
 	int fds[3] = {0, 1, 0};
 	pid_t pid;
@@ -708,14 +708,14 @@ print:
 	return 1;
 }
 
-static int read_audiod_pipe(fd_set *rfds)
+static int read_stat_pipe(fd_set *rfds)
 {
 	static char *buf;
 	static int bufsize, loaded;
 	int ret, ret2;
 	size_t sz;
 
-	if (audiod_pipe < 0)
+	if (stat_pipe < 0)
 		return 0;
 	if (loaded >= bufsize) {
 		if (bufsize > 1000 * 1000) {
@@ -726,7 +726,7 @@ static int read_audiod_pipe(fd_set *rfds)
 		buf = para_realloc(buf, bufsize);
 	}
 	assert(loaded < bufsize);
-	ret = read_nonblock(audiod_pipe, buf + loaded, bufsize - loaded,
+	ret = read_nonblock(stat_pipe, buf + loaded, bufsize - loaded,
 		rfds, &sz);
 	loaded += sz;
 	ret2 = for_each_stat_item(buf, loaded, update_item);
@@ -907,7 +907,7 @@ static void handle_signal(int sig)
 	}
 }
 
-static int open_audiod_pipe(void)
+static int open_stat_pipe(void)
 {
 	static int init = 1;
 
@@ -915,7 +915,7 @@ static int open_audiod_pipe(void)
 		init = 0;
 	else
 		sleep(1);
-	return para_open_audiod_pipe(conf.stat_cmd_arg);
+	return para_open_stat_pipe(conf.stat_cmd_arg);
 }
 
 /*
@@ -946,11 +946,10 @@ repeat:
 //	ret = refresh_status();
 	FD_ZERO(&rfds);
 	max_fileno = 0;
-	/* audiod pipe */
-	if (audiod_pipe < 0)
-		audiod_pipe = open_audiod_pipe();
-	if (audiod_pipe >= 0)
-		para_fd_set(audiod_pipe, &rfds, &max_fileno);
+	if (stat_pipe < 0)
+		stat_pipe = open_stat_pipe();
+	if (stat_pipe >= 0)
+		para_fd_set(stat_pipe, &rfds, &max_fileno);
 	/* signal pipe */
 	para_fd_set(signal_pipe, &rfds, &max_fileno);
 	/* command pipe only for COMMAND_MODE */
@@ -981,11 +980,11 @@ repeat:
 			return 0;
 		}
 	}
-	ret = read_audiod_pipe(&rfds);
+	ret = read_stat_pipe(&rfds);
 	if (ret < 0) {
-		PARA_NOTICE_LOG("closing audiod pipe: %s\n", para_strerror(-ret));
-		close(audiod_pipe);
-		audiod_pipe = -1;
+		PARA_NOTICE_LOG("closing stat pipe: %s\n", para_strerror(-ret));
+		close(stat_pipe);
+		stat_pipe = -1;
 		clear_all_items();
 		free(stat_content[SI_BASENAME]);
 		stat_content[SI_BASENAME] =