X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=0629d7c6add39b778b42567d002cdd7e31bdd45c;hp=3b6111964a8012de6bbdddd4b7ec340a1173ce48;hb=849c979d89d3062dd9a27c2e43ed08a573759659;hpb=c839ef92e35d5604748aa4674b400156ff7baced

diff --git a/audiod.c b/audiod.c
index 3b611196..0629d7c6 100644
--- a/audiod.c
+++ b/audiod.c
@@ -41,7 +41,7 @@
 /** define the array of error lists needed by para_audiod */
 INIT_AUDIOD_ERRLISTS;
 /** define the array containing all supported audio formats */
-DEFINE_AUDIO_FORMAT_ARRAY;
+const char *audio_formats[] = {AUDIOD_AUDIO_FORMAT_ARRAY NULL};
 
 /** defines how to handle one supported audio format */
 struct audio_format_info {
@@ -400,16 +400,18 @@ static void rn_event_handler(struct task *t)
 	}
 }
 
-static void open_receiver(int format)
+static int open_receiver(int format)
 {
 	struct audio_format_info *a = &afi[format];
 	struct slot_info *s;
 	int ret, slot_num;
 	struct receiver_node *rn;
+	const struct timeval restart_delay = {1, 0};
 
-	slot_num = get_empty_slot();
-	if (slot_num < 0)
-		clean_exit(EXIT_FAILURE, PARA_STRERROR(-slot_num));
+	ret = get_empty_slot();
+	if (ret < 0)
+		goto err;
+	slot_num = ret;
 	s = &slot[slot_num];
 	s->format = format;
 	s->receiver_node = para_calloc(sizeof(struct receiver_node));
@@ -418,11 +420,9 @@ static void open_receiver(int format)
 	rn->conf = a->receiver_conf;
 	ret = a->receiver->open(s->receiver_node);
 	if (ret < 0) {
-		PARA_ERROR_LOG("failed to open receiver (%s)\n",
-			PARA_STRERROR(-ret));
 		free(s->receiver_node);
 		s->receiver_node = NULL;
-		return;
+		goto err;
 	}
 	PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
 		audio_formats[s->format], a->receiver->name, slot_num);
@@ -432,6 +432,11 @@ static void open_receiver(int format)
 	rn->task.event_handler = rn_event_handler;
 	sprintf(rn->task.status, "%s receiver node", rn->receiver->name);
 	register_task(&rn->task);
+	return 1;
+err:
+	PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+	tv_add(now, &restart_delay, &afi[format].restart_barrier);
+	return ret;
 }
 
 static int receiver_running(int format)
@@ -451,10 +456,12 @@ static int open_current_receiver(struct sched *s)
 {
 	int i;
 	struct timeval diff;
+	char *audio_format = stat_task->stat_item_values[SI_FORMAT];
 
-	if (!stat_task->af_status || !stat_task->pcd)
+	if (!audio_format || !stat_task->pcd)
 		return 0;
-	i = get_audio_format_num(stat_task->af_status);
+	i = get_audio_format_num(audio_format + strlen(
+		status_item_list[SI_FORMAT]) + 1);
 	if (i < 0)
 		return 0;
 	if (receiver_running(i))
@@ -463,8 +470,7 @@ static int open_current_receiver(struct sched *s)
 		s->timeout = diff;
 		return 0;
 	}
-	open_receiver(i);
-	return 1;
+	return open_receiver(i) < 0? 0 : 1;
 }
 
 static void compute_time_diff(const struct timeval *status_time)
@@ -529,10 +535,6 @@ static void check_stat_line(char *line)
 	case SI_STATUS:
 		stat_task->playing = strstr(line, "playing")? 1 : 0;
 		break;
-	case SI_FORMAT:
-		free(stat_task->af_status);
-		stat_task->af_status = para_strdup(line + ilen + 1);
-		break;
 	case SI_OFFSET:
 		stat_task->offset_seconds = atoi(line + ilen + 1);
 		break;
@@ -637,10 +639,6 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
 		if (!sl->fc || !*sl->fc->out_loaded || sl->wng)
 			continue;
 		if (tv_diff(now, &initial_delay_barrier, &diff) > 0) {
-			PARA_INFO_LOG("barrier: %lu:%lu, now: %lu, %lu\n",
-				initial_delay_barrier.tv_sec,
-				initial_delay_barrier.tv_usec,
-				now->tv_sec, now->tv_usec);
 			open_writers(i);
 			s->timeout = min_delay;
 			continue;
@@ -657,7 +655,6 @@ static void audiod_post_select(__a_unused struct sched *s,
 {
 	int i;
 
-	/* save away the current time for other users */
 	t->ret = 1;
 	FOR_EACH_SLOT(i)
 		try_to_close_slot(i);
@@ -756,7 +753,6 @@ static int init_receivers(void)
 	for (i = conf.receiver_given - 1; i >= 0; i--) {
 		char *arg = conf.receiver_arg[i];
 		char *recv_arg = strchr(arg, ':');
-		PARA_INFO_LOG("arg: %s\n", arg);
 		ret = -E_MISSING_COLON;
 		if (!recv_arg)
 			goto out;
@@ -952,8 +948,7 @@ static void command_post_select(struct sched *s, struct task *t)
 	struct command_task *ct = t->private_data;
 
 	t->ret = 1; /* always successful */
-	if (audiod_status != AUDIOD_OFF)
-		audiod_status_dump();
+	audiod_status_dump();
 	if (!FD_ISSET(ct->fd, &s->rfds))
 		return;
 	ret = handle_connect(ct->fd);
@@ -1019,13 +1014,22 @@ static void status_pre_select(struct sched *s, struct task *t)
 static void status_post_select(__a_unused struct sched *s, struct task *t)
 {
 	struct status_task *st = t->private_data;
+	unsigned bytes_left;
 
 	t->ret = 1;
-	if (!st->pcd || !st->pcd->loaded
-			|| st->pcd->status != CL_RECEIVING)
+	if (!st->pcd || st->pcd->status != CL_RECEIVING)
 		return;
-	st->pcd->loaded = for_each_line(st->pcd->buf, st->pcd->loaded,
+	bytes_left = for_each_line(st->pcd->buf, st->pcd->loaded,
 		&check_stat_line);
+	if (st->pcd->loaded != bytes_left) {
+		st->last_status_read = *now;
+		st->pcd->loaded = bytes_left;
+	} else {
+		struct timeval diff;
+		tv_diff(now, &st->last_status_read, &diff);
+		if (diff.tv_sec > 61)
+			close_stat_pipe();
+	}
 }
 
 static void init_status_task(struct status_task *st)