X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=85c14a59074db417057a6ea7ed607cf37406b616;hb=27879fbdef3653aa7ba66eda97dc7cd731f2ce26;hp=88599c3fa297337b6a3f598b31f92d6e6b4b0993;hpb=8af63afe0ce633fd488f0669614e2d08680f90bc;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 88599c3f..85c14a59 100644
--- a/audiod.c
+++ b/audiod.c
@@ -44,8 +44,6 @@ static struct lls_parse_result *lpr;
 #define OPT_GIVEN(_name) (lls_opt_given(OPT_RESULT(_name)))
 #define OPT_STRING_VAL(_name) (lls_string_val(0, OPT_RESULT(_name)))
 #define OPT_UINT32_VAL(_name) (lls_uint32_val(0, OPT_RESULT(_name)))
-#define ENUM_STRING_VAL(_name) (lls_enum_string_val(OPT_UINT32_VAL(_name), \
-	lls_opt(LSG_AUDIOD_PARA_AUDIOD_OPT_ ## _name, CMD_PTR)))
 
 __printf_2_3 void (*para_log)(int, const char*, ...) = daemon_log;
 /** define the array containing all supported audio formats */
@@ -389,7 +387,7 @@ static void parse_config_or_die(void)
 			para_strerror(-ret));
 		exit(EXIT_FAILURE);
 	}
-	daemon_set_loglevel(ENUM_STRING_VAL(LOGLEVEL));
+	daemon_set_loglevel(OPT_UINT32_VAL(LOGLEVEL));
 	n = OPT_GIVEN(USER_ALLOW);
 	if (n == 0)
 		return;
@@ -445,7 +443,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 +478,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;
@@ -1050,7 +1066,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 +1233,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;
@@ -1443,7 +1460,7 @@ int main(int argc, char *argv[])
 	ret = lls(lls_parse(argc, argv, CMD_PTR, &lpr, &errctx));
 	if (ret < 0)
 		goto out;
-	daemon_set_loglevel(ENUM_STRING_VAL(LOGLEVEL));
+	daemon_set_loglevel(OPT_UINT32_VAL(LOGLEVEL));
 	daemon_drop_privileges_or_die(OPT_STRING_VAL(USER),
 		OPT_STRING_VAL(GROUP));
 	version_handle_flag("audiod", OPT_GIVEN(VERSION));