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

diff --git a/audiod.c b/audiod.c
index a5a77437..12de0886 100644
--- a/audiod.c
+++ b/audiod.c
@@ -445,7 +445,8 @@ static void close_receiver(int slot_num)
 	task_reap(&s->receiver_node->task);
 	free(s->receiver_node);
 	s->receiver_node = NULL;
-	stat_task->current_audio_format_num = -1;
+	if (audiod_status == AUDIOD_ON)
+		stat_task->current_audio_format_num = -1;
 	tv_add(now, &(struct timeval)EMBRACE(0, 200 * 1000),
 		&a->restart_barrier);
 }
@@ -479,6 +480,23 @@ static void close_writers(struct slot_info *s)
 	s->wns = NULL;
 }
 
+static void notify_writers(int error)
+{
+	int i;
+
+	FOR_EACH_SLOT(i) {
+		struct slot_info *s = slot + i;
+		struct audio_format_info *a;
+		int j;
+
+		if (s->format < 0)
+			continue;
+		a = afi + s->format;
+		for (j = 0; j < a->num_writers; j++)
+			task_notify(s->wns[j].task, error);
+	}
+}
+
 static void close_filters(struct slot_info *s)
 {
 	int i;
@@ -731,8 +749,8 @@ static void compute_time_diff(const struct timeval *status_time)
 	if (count > 5) {
 		int s = tv_diff(&diff, &stat_task->sa_time_diff, &tmp);
 		if (tv_diff(&max_deviation, &tmp, NULL) < 0)
-			PARA_WARNING_LOG("time diff jump: %lums\n",
-				s * tv2ms(&tmp));
+			PARA_WARNING_LOG("time diff jump: %c%lums\n",
+				s < 0? '-' : '+', tv2ms(&tmp));
 	}
 	count++;
 	sa_time_diff_sign = tv_convex_combination(
@@ -801,7 +819,7 @@ static int parse_stream_command(const char *txt, const char **cmd)
 		return -E_MISSING_COLON;
 	*cmd = p + 1;
 	len = p - txt;
-	re = malloc(len + 1);
+	re = para_malloc(len + 1);
 	strncpy(re, txt, len);
 	re[len] = '\0';
 	ret = get_matching_audio_format_nums(re);
@@ -1045,12 +1063,12 @@ 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:
 	case SIGHUP:
-		PARA_NOTICE_LOG("received signal %d\n", signum);
+		PARA_WARNING_LOG("terminating on signal %d\n", signum);
 		task_notify_all(s, E_AUDIOD_SIGNAL);
 		return -E_AUDIOD_SIGNAL;
 	}
@@ -1074,9 +1092,9 @@ 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_ERROR_LOG("%s\n", para_strerror(-ret));
+		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 		if (ret == -E_AUDIOD_TERM) {
 			task_notify_all(s, -ret);
 			return ret;
@@ -1217,8 +1235,9 @@ static void start_stop_decoders(void)
 	struct slot_info *sl;
 
 	close_unused_slots();
-	if (audiod_status != AUDIOD_ON ||
-			!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
+	if (audiod_status != AUDIOD_ON)
+		return notify_writers(E_NOT_PLAYING);
+	if (!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
 		return notify_receivers(E_NOT_PLAYING);
 	if (!must_start_decoder())
 		return;
@@ -1491,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);