X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=838f375fe6df2c2d96c4bfa2aa41d28e64c29f72;hb=a296ecdb1ab1657d3ec756fbb4cdd9618b621a2e;hp=b93f29de4498c50f574e55c4c8b3e9a34dfe0aee;hpb=f787a626b8885247948e3c47ae886b1e3a7c2a3a;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index b93f29de..838f375f 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;
@@ -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);
@@ -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;
@@ -1451,7 +1470,6 @@ int main(int argc, char *argv[])
 	parse_config_or_die();
 	crypt_init();
 	daemon_set_priority(OPT_UINT32_VAL(PRIORITY));
-	recv_init();
 	if (daemon_init_colors_or_die(OPT_UINT32_VAL(COLOR), COLOR_AUTO,
 			COLOR_NO, OPT_GIVEN(LOGFILE))) {
 		for (i = 0; i < OPT_GIVEN(LOG_COLOR); i++)