X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=bd87cf870203613648aec2261d501835062b4ade;hp=975b3dfee38a86352bf0c224b135424d6151826d;hb=ff067f37f441537ffec6ef4ee86420ebae727f9a;hpb=6fe4a634c578a19b45371798871312e712e1f817

diff --git a/audiod.c b/audiod.c
index 975b3dfe..bd87cf87 100644
--- a/audiod.c
+++ b/audiod.c
@@ -609,17 +609,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 +696,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);
@@ -809,10 +806,10 @@ 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);
@@ -841,14 +838,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;
 	}
 }
@@ -1097,8 +1096,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]);
@@ -1562,9 +1562,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 +1645,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);