X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=12de088639448ca9a227fa857bf99cb406e95b8b;hb=181beb316afad036ac01a778544c5dec0a8d51c7;hp=119adbc0be2ddbf24a7d06de4b77a5a3d88bd230;hpb=26243a4b963bc3c59020b0469f1e469025da0ad8;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 119adbc0..12de0886 100644
--- a/audiod.c
+++ b/audiod.c
@@ -1063,7 +1063,7 @@ static int signal_post_select(struct sched *s, void *context)
 	ret = task_get_notification(st->task);
 	if (ret < 0)
 		return ret;
-	signum = para_next_signal(&s->rfds);
+	signum = para_next_signal();
 	switch (signum) {
 	case SIGINT:
 	case SIGTERM:
@@ -1092,7 +1092,7 @@ static int command_post_select(struct sched *s, void *context)
 	ret = task_get_notification(ct->task);
 	if (ret < 0)
 		return ret;
-	ret = handle_connect(ct->fd, &s->rfds);
+	ret = dispatch_local_connection(ct->fd);
 	if (ret < 0) {
 		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 		if (ret == -E_AUDIOD_TERM) {
@@ -1510,8 +1510,7 @@ int main(int argc, char *argv[])
 		.context = signal_task,
 	}, &sched);
 
-	sched.default_timeout.tv_sec = 2;
-	sched.default_timeout.tv_usec = 999 * 1000;
+	sched.default_timeout = 2999;
 	ret = schedule(&sched);
 	audiod_cleanup();
 	sched_shutdown(&sched);