X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=e3e3bd9acd9b2ccd771fc359f4e57ae24dbe5cce;hp=4f2d4151b58cf62e980c4f61c94c8ca1e1923297;hb=b01605d7062e4d1f005d5aaaaed158d8efe06d79;hpb=9c5fbc5dd8b53604d7e73fb6714ee2b5e3458866

diff --git a/audiod.c b/audiod.c
index 4f2d4151..e3e3bd9a 100644
--- a/audiod.c
+++ b/audiod.c
@@ -343,10 +343,11 @@ static void parse_config_or_die(void)
 		PARA_EMERG_LOG("can not read config file %s\n", config_file);
 		goto err;
 	}
-	if (ret)
+	if (ret) {
 		audiod_cmdline_parser_config_file(config_file, &conf, &params);
+		daemon_set_loglevel(conf.loglevel_arg);
+	}
 	free(config_file);
-	daemon_set_loglevel(conf.loglevel_arg);
 	return;
 err:
 	free(config_file);
@@ -496,7 +497,6 @@ static void open_filters(struct slot_info *s)
 		fn->conf = a->filter_conf[i];
 		fn->task.pre_select = f->pre_select;
 		fn->task.post_select = f->post_select;
-
 		fn->btrn = btr_new_node(&(struct btr_node_description)
 			EMBRACE(.name = f->name, .parent = parent,
 				.handler = f->execute, .context = fn));
@@ -992,7 +992,7 @@ static void signal_pre_select(struct sched *s, struct task *t)
 	para_fd_set(st->fd, &s->rfds, &s->max_fileno);
 }
 
-static void signal_post_select(struct sched *s, __a_unused struct task *t)
+static int signal_post_select(struct sched *s, __a_unused struct task *t)
 {
 	int signum;
 
@@ -1004,6 +1004,7 @@ static void signal_post_select(struct sched *s, __a_unused struct task *t)
 		PARA_EMERG_LOG("terminating on signal %d\n", signum);
 		clean_exit(EXIT_FAILURE, "caught deadly signal");
 	}
+	return 0;
 }
 
 static void signal_setup_default(struct signal_task *st)
@@ -1019,7 +1020,7 @@ static void command_pre_select(struct sched *s, struct task *t)
 	para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
 }
 
-static void command_post_select(struct sched *s, struct task *t)
+static int command_post_select(struct sched *s, struct task *t)
 {
 	int ret;
 	struct command_task *ct = container_of(t, struct command_task, task);
@@ -1036,6 +1037,7 @@ static void command_post_select(struct sched *s, struct task *t)
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	audiod_status_dump();
+	return 0;
 }
 
 static void init_command_task(struct command_task *ct)
@@ -1089,32 +1091,44 @@ static void set_stat_task_restart_barrier(unsigned seconds)
 	tv_add(now, &delay, &stat_task->restart_barrier);
 }
 
-static void try_to_close_slot(int slot_num)
+static bool must_close_slot(int slot_num)
 {
 	struct slot_info *s = &slot[slot_num];
 	struct audio_format_info *a = afi + s->format;
 	int i;
 
 	if (s->format < 0)
-		return;
+		return false;
 	if (s->receiver_node && s->receiver_node->task.error >= 0)
-		return;
+		return false;
 	for (i = 0; i < a->num_filters; i++)
 		if (s->fns && s->fns[i].task.error >= 0)
-			return;
+			return false;
 	if (a->num_writers > 0) {
 		for (i = 0; i < a->num_writers; i++)
 			if (s->wns && s->wns[i].task.error >= 0)
-				return;
+				return false;
 	} else {
 		if (s->wns && s->wns[0].task.error >= 0)
-			return;
+			return false;
+	}
+	return true;
+}
+
+static void close_unused_slots(void)
+{
+	int i;
+
+	FOR_EACH_SLOT(i) {
+		struct slot_info *s = slot + i;
+		if (!must_close_slot(i))
+			continue;
+		PARA_INFO_LOG("closing slot %d\n", i);
+		close_writers(s);
+		close_filters(s);
+		close_receiver(i);
+		clear_slot(i);
 	}
-	PARA_INFO_LOG("closing slot %d\n", slot_num);
-	close_writers(s);
-	close_filters(s);
-	close_receiver(slot_num);
-	clear_slot(slot_num);
 }
 
 /*
@@ -1123,12 +1137,11 @@ static void try_to_close_slot(int slot_num)
  */
 static void start_stop_decoders(void)
 {
-	int i, ret;
+	int ret;
 	struct slot_info *sl;
 	struct audio_format_info *a;
 
-	FOR_EACH_SLOT(i)
-		try_to_close_slot(i);
+	close_unused_slots();
 	if (audiod_status != AUDIOD_ON ||
 			!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
 		return notify_receivers(E_NOT_PLAYING);
@@ -1151,10 +1164,13 @@ static void start_stop_decoders(void)
 static void status_pre_select(struct sched *s, struct task *t)
 {
 	struct status_task *st = container_of(t, struct status_task, task);
-	int ret, cafn = stat_task->current_audio_format_num;
+	int i, ret, cafn = stat_task->current_audio_format_num;
 
 	if (must_start_decoder())
 		goto min_delay;
+	FOR_EACH_SLOT(i)
+		if (must_close_slot(i))
+			goto min_delay;
 	ret = btr_node_status(st->btrn, st->min_iqs, BTR_NT_LEAF);
 	if (ret > 0)
 		goto min_delay;
@@ -1177,7 +1193,7 @@ min_delay:
 }
 
 /* restart the client task if necessary */
-static void status_post_select(struct sched *s, struct task *t)
+static int status_post_select(struct sched *s, struct task *t)
 {
 	struct status_task *st = container_of(t, struct status_task, task);
 
@@ -1250,6 +1266,7 @@ static void status_post_select(struct sched *s, struct task *t)
 	st->last_status_read = *now;
 out:
 	start_stop_decoders();
+	return 0;
 }
 
 static void init_status_task(struct status_task *st)
@@ -1334,9 +1351,9 @@ int main(int argc, char *argv[])
 	};
 
 	valid_fd_012();
-	if (audiod_cmdline_parser_ext(argc, argv, &conf, &params))
-		exit(EXIT_FAILURE);
+	audiod_cmdline_parser_ext(argc, argv, &conf, &params);
 	HANDLE_VERSION_FLAG("audiod", conf);
+	daemon_set_loglevel(conf.loglevel_arg);
 	/* init receivers/filters/writers early to make help work */
 	recv_init();
 	filter_init();