X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=41fcdd8f1bc5e49ec49ff3d44369cdeb81ab4f19;hp=1663dad3d88e8bb90ec69e2f7cffa1bcbd2ce64e;hb=25c1156924009d991d7a4d3f780f51e77aa9cd6f;hpb=eecc102ad0abeb0335fe994bb72031a15b9090d7

diff --git a/audiod.c b/audiod.c
index 1663dad3..41fcdd8f 100644
--- a/audiod.c
+++ b/audiod.c
@@ -142,7 +142,6 @@ static struct status_task status_task_struct;
  * \sa struct status_task
  */
 static struct status_task *stat_task = &status_task_struct;
-static struct timeval initial_delay_barrier;
 
 /**
  * the task for handling audiod commands
@@ -549,16 +548,13 @@ static int open_receiver(int format)
 	int ret, slot_num;
 	struct receiver *r = a->receiver;
 	struct receiver_node *rn;
-	const struct timeval restart_delay = {2, 0};
 
+	tv_add(now, &(struct timeval)EMBRACE(2, 0), &a->restart_barrier);
 	ret = get_empty_slot();
 	if (ret < 0)
-		goto err;
+		return ret;
 	slot_num = ret;
-	s = &slot[slot_num];
-	s->format = format;
-	s->receiver_node = para_calloc(sizeof(struct receiver_node));
-	rn = s->receiver_node;
+	rn = para_calloc(sizeof(*rn));
 	rn->receiver = r;
 	rn->conf = a->receiver_conf;
 	rn->btrn = btr_new_node(&(struct btr_node_description)
@@ -567,21 +563,18 @@ static int open_receiver(int format)
 	if (ret < 0) {
 		btr_free_node(rn->btrn);
 		free(rn);
-		s->receiver_node = NULL;
-		goto err;
+		return ret;
 	}
+	s = &slot[slot_num];
+	s->format = format;
+	s->receiver_node = rn;
 	PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
-		audio_formats[s->format], r->name, slot_num);
+		audio_formats[format], r->name, slot_num);
 	rn->task.pre_select = r->pre_select;
 	rn->task.post_select = r->post_select;
 	sprintf(rn->task.status, "%s receiver node", r->name);
 	register_task(&rn->task);
-	ret = slot_num;
-err:
-	if (ret < 0)
-		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
-	tv_add(now, &restart_delay, &afi[format].restart_barrier);
-	return ret;
+	return slot_num;
 }
 
 /* return: 0: Not running, 1: Running, -1: Running but eof (or error) */
@@ -719,20 +712,8 @@ static int update_item(int itemnum, char *buf)
 		break;
 	case SI_STREAM_START:
 		if (sscanf(buf, "%lu.%lu", &sec, &usec) == 2) {
-			struct timeval a_start, delay;
-			delay.tv_sec = conf.stream_delay_arg / 1000;
-			delay.tv_usec = (conf.stream_delay_arg % 1000) * 1000;
 			stat_task->server_stream_start.tv_sec = sec;
 			stat_task->server_stream_start.tv_usec = usec;
-			if (compute_time_diff(NULL) > 2) {
-				if (stat_task->sa_time_diff_sign < 0)
-					tv_add(&stat_task->server_stream_start,
-						&stat_task->sa_time_diff, &a_start);
-				else
-					tv_diff(&stat_task->server_stream_start,
-						&stat_task->sa_time_diff, &a_start);
-				tv_add(&a_start, &delay, &initial_delay_barrier);
-			}
 		}
 		break;
 	case SI_CURRENT_TIME:
@@ -1142,8 +1123,10 @@ static void start_stop_decoders(void)
 	if (!must_start_decoder())
 		return;
 	ret = open_receiver(stat_task->current_audio_format_num);
-	if (ret < 0)
+	if (ret < 0) {
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 		return;
+	}
 	sl = slot + ret;
 	a = afi + sl->format;
 	if (a->num_filters)