X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=113f1132e96c92f5045c4acdc72211728230137b;hb=c2e987abfcf711c85e00fc11b9ef00d38ad89f3a;hp=47bf2e27ed405d93a28073486bf5fa85c0f2b363;hpb=d4603bf234d23adb56b208efb90ce66772c4ef5b;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 47bf2e27..113f1132 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);
@@ -1050,7 +1068,7 @@ static int signal_post_select(struct sched *s, void *context)
 	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;
 	}
@@ -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;
@@ -1449,9 +1468,8 @@ int main(int argc, char *argv[])
 	version_handle_flag("audiod", OPT_GIVEN(VERSION));
 	handle_help_flags();
 	parse_config_or_die();
-	init_random_seed_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++)
@@ -1498,7 +1516,7 @@ int main(int argc, char *argv[])
 	audiod_cleanup();
 	sched_shutdown(&sched);
 	signal_shutdown(signal_task);
-
+	crypt_shutdown();
 out:
 	lls_free_parse_result(lpr, CMD_PTR);
 	if (errctx)