X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=3d01931173f2d09112f7035c4b1af614a35f094e;hp=b0f9f786932be2e44e5c87bb9411345746e16ff1;hb=a041c8f444140dca47109371c4ede6b32b33be60;hpb=ff5444a95fa551c0bac1ca74f36770276a82703e

diff --git a/audiod.c b/audiod.c
index b0f9f786..3d019311 100644
--- a/audiod.c
+++ b/audiod.c
@@ -104,6 +104,7 @@ struct audiod_command {
 const char *name;
 /** pointer to the function that handles the command */
 int (*handler)(int, int, char**);
+int (*line_handler)(int, char*);
 /** one-line description of the command */
 const char *description;
 /** summary of the command line options */
@@ -114,7 +115,7 @@ const char *help;
 
 extern const char *status_item_list[NUM_STAT_ITEMS];
 
-static int com_grab(int, int, char **);
+static int com_grab(int, char *);
 static int com_cycle(int, int, char **);
 static int com_help(int, int, char **);
 static int com_off(int, int, char **);
@@ -150,7 +151,7 @@ static struct audiod_command cmds[] = {
 },
 {
 .name = "grab",
-.handler = com_grab,
+.line_handler = com_grab,
 .description = "grab the audio stream",
 .synopsis = "-- grab [grab_options]",
 .help =
@@ -368,8 +369,6 @@ __malloc static char *decoder_flags(void)
 			flag += 1;
 		if (s->wpid > 0)
 			flag += 2;
-		if (flag != '0')
-			flag += s->format * 4;
 		decoder_flags[i] = flag;
 	}
 	decoder_flags[MAX_STREAM_SLOTS] = '\0';
@@ -609,17 +608,14 @@ __malloc static char *glob_cmd(char *cmd)
 	else
 		tv_diff(&server_stream_start, &sa_time_diff, &rss);
 	tv_add(&rss, &delay, &tmp);
-	replacement = make_message("%lu:%lu", tmp.tv_sec, tmp.tv_usec);
+	replacement = make_message("%lu:%lu",
+		(long unsigned)tmp.tv_sec,
+		(long unsigned)tmp.tv_usec);
 	ret = s_a_r(cmd, "STREAM_START", replacement);
 	free(replacement);
 	if (!ret)
 		goto out;
 	PARA_INFO_LOG("cmd: %s, repl: %s\n", cmd, ret);
-	{
-	struct timeval now;
-	gettimeofday(&now, NULL);
-	PARA_INFO_LOG("now: %lu:%lu\n", now.tv_sec, now.tv_usec);
-	}
 out:
 	return ret;
 }
@@ -699,7 +695,7 @@ static void start_stream_writer(int slot_num)
 	if (a->write_cmd)
 		glob = glob_cmd(a->write_cmd);
 	if (!glob)
-		glob = para_strdup("para_play");
+		glob = para_strdup("para_write -w alsa");
 	PARA_INFO_LOG("starting stream writer: %s\n", glob);
 	open_filters(slot_num);
 	ret = para_exec_cmdline_pid(&s->wpid, glob, fds);
@@ -797,21 +793,22 @@ static void compute_time_diff(const struct timeval *status_time)
 		count > 10? sign : sign * time_smooth, &diff,
 		&tmp);
 	sa_time_diff = tmp;
-	PARA_INFO_LOG("time diff (cur/avg): "
-		"%li:%lu/%li:%lu\n",
-		sign * diff.tv_sec, (diff.tv_usec + 500) / 1000,
-		sa_time_diff_sign * sa_time_diff.tv_sec,
-		(sa_time_diff.tv_usec + 500)/ 1000);
+	PARA_INFO_LOG("time diff (cur/avg): %s%lums/%s%lums\n",
+		sign > 0? "+" : "-",
+		tv2ms(&diff),
+		sa_time_diff_sign ? "+" : "-",
+		tv2ms(&sa_time_diff)
+	);
 }
 
 static void check_stat_line(char *line)
 {
 	int itemnum;
 	size_t ilen = 0;
-	struct timeval tv;
+	long unsigned sec, usec;
 	char *tmp;
 
-	PARA_INFO_LOG("line: %s\n", line);
+//	PARA_INFO_LOG("line: %s\n", line);
 	if (!line)
 		return;
 	itemnum = stat_line_valid(line);
@@ -840,14 +837,16 @@ static void check_stat_line(char *line)
 		length_seconds = atoi(line + ilen + 1);
 		break;
 	case SI_STREAM_START:
-		if (sscanf(line + ilen + 1, "%lu.%lu",
-				&tv.tv_sec, &tv.tv_usec) == 2)
-			server_stream_start = tv;
+		if (sscanf(line + ilen + 1, "%lu.%lu", &sec, &usec) == 2) {
+			server_stream_start.tv_sec = sec;
+			server_stream_start.tv_usec = usec;
+		}
 		break;
 	case SI_CURRENT_TIME:
-		if (sscanf(line + ilen + 1, "%lu.%lu", &tv.tv_sec,
-				&tv.tv_usec) == 2)
+		if (sscanf(line + ilen + 1, "%lu.%lu", &sec, &usec) == 2) {
+			struct timeval tv = {sec, usec};
 			compute_time_diff(&tv);
+		}
 		break;
 	}
 }
@@ -1096,8 +1095,9 @@ static int setup_default_filters(void)
 		free(tmp);
 		if (ret < 0)
 			goto out;
-		PARA_INFO_LOG("%s -> default filter: %s\n", audio_formats[i], filters[j].name);
-		ret = add_filter(i, para_strdup("wav"));
+		PARA_INFO_LOG("%s -> default filter: %s\n", audio_formats[i],
+			filters[j].name);
+		ret = add_filter(i, "wav");
 		if (ret < 0)
 			goto out;
 		PARA_INFO_LOG("%s -> default filter: wav\n", audio_formats[i]);
@@ -1334,16 +1334,15 @@ static char *list_filters(void)
 }
 #endif
 
-static int com_grab(int fd, int argc, char **argv)
+
+static int com_grab(int fd, char *cmdline)
 {
 	struct grab_client *gc;
 	struct filter_node *fn;
 	int i, err;
 	char *msg;
 
-	PARA_INFO_LOG("argc: %d, argv[0]: %s, optind: %d\n", argc, argv[0], optind);
-	gc = grab_client_new(fd, argc, argv, &err);
-	PARA_INFO_LOG("argc: %d, argv[0]: %s, optind: %d\n", argc, argv[0], optind);
+	gc = grab_client_new(fd, cmdline, &err);
 	if (!gc)
 		goto err_out;
 	fn = find_filter_node(gc->conf->slot_arg, gc->audio_format_num, gc->conf->filter_num_arg);
@@ -1432,7 +1431,7 @@ static int check_perms(uid_t uid)
 static int handle_connect(void)
 {
 	int i, argc, ret, clifd = -1;
-	char *buf = para_malloc(MAXLINE), **argv = NULL;
+	char *p, *buf = para_malloc(MAXLINE), **argv = NULL;
 	struct sockaddr_un unix_addr;
 
 	ret = para_accept(audiod_socket, &unix_addr, sizeof(struct sockaddr_un));
@@ -1442,17 +1441,33 @@ static int handle_connect(void)
 	ret = recv_cred_buffer(clifd, buf, MAXLINE - 1);
 	if (ret < 0)
 		goto out;
-	PARA_INFO_LOG("connection from user %i\n",  ret);
-	buf[ret] = '\0';
+	PARA_INFO_LOG("connection from user %i, buf: %s\n",  ret, buf);
 	ret = check_perms(ret);
 	if (ret < 0)
 		goto out;
-	argc = split_args(buf, &argv, "\n");
-	PARA_INFO_LOG("argv[0]: %s, argc= %d\n", argv[0], argc);
+	ret = -E_INVALID_AUDIOD_CMD;
+	p = strchr(buf, '\n');
+	if (!p)
+		p = "";
+	else {
+		*p = '\0';
+		p++;
+	}
 	for (i = 0; cmds[i].name; i++) {
-		if (strcmp(cmds[i].name, argv[0]))
+		int j;
+		if (strcmp(cmds[i].name, buf))
 			continue;
-		ret = cmds[i].handler(clifd, argc, argv);
+		if (cmds[i].handler) {
+			argc = split_args(buf, &argv, "\n");
+			PARA_INFO_LOG("argv[0]: %s, argc= %d\n", argv[0], argc);
+			ret = cmds[i].handler(clifd, argc, argv);
+			goto out;
+		}
+		for (j = 0; p[j]; j++)
+			if (p[j] == '\n')
+				p[j] = ' ';
+		PARA_INFO_LOG("cmd: %s, options: %s\n", buf, p);
+		ret = cmds[i].line_handler(clifd, p);
 		goto out;
 	}
 	ret = -E_INVALID_AUDIOD_CMD; /* cmd not found */
@@ -1562,9 +1577,9 @@ static void __noreturn audiod_mainloop(void)
 repeat:
 	FD_ZERO(&wfds);
 	FD_ZERO(&rfds);
+	max_fileno = -1;
 	/* always check signal pipe and the local socket */
-	FD_SET(signal_pipe, &rfds);
-	max_fileno = signal_pipe;
+	para_fd_set(signal_pipe, &rfds, &max_fileno);
 	para_fd_set(audiod_socket, &rfds, &max_fileno);
 
 	if (audiod_status != AUDIOD_ON)
@@ -1645,7 +1660,6 @@ int __noreturn main(int argc, char *argv[])
 	char *cf;
 	int i;
 
-	fprintf(stderr, "argc: %d\n", argc);
 	valid_fd_012();
 	hostname = para_hostname();
 	cmdline_parser(argc, argv, &conf);