X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=f744dd89b20479736a4b80cd65395c313b528d12;hb=d7bb544c34b5e2eef10e13e672d82a33864be8ab;hp=bd7bb5b1ac704357e3639ebbe4716bf495797404;hpb=2742af12a1a8cd99302f60521efe47cfbf16e963;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index bd7bb5b1..f744dd89 100644
--- a/audiod.c
+++ b/audiod.c
@@ -494,18 +494,6 @@ static void kill_all_decoders(void)
 	}
 }
 
-static void check_sigchld(void)
-{
-	pid_t pid;
-
-reap_next_child:
-	pid = para_reap_child();
-	if (pid <= 0)
-		return;
-	PARA_CRIT_LOG("para_client died (pid %d)\n", pid);
-	goto reap_next_child;
-}
-
 static int get_empty_slot(void)
 {
 	int i;
@@ -517,11 +505,7 @@ static int get_empty_slot(void)
 			clear_slot(i);
 			return i;
 		}
-		if (s->wng)
-			continue;
-		if (s->receiver_node)
-			continue;
-		if (s->fc)
+		if (s->wng || s->receiver_node || s->fc)
 			continue;
 		clear_slot(i);
 		return i;
@@ -564,7 +548,8 @@ static void close_stat_pipe(void)
 	offset_seconds = 0;
 	audiod_status_dump();
 	playing = 0;
-	stat_item_values[SI_STATUS_BAR] = make_message("%s:no connection to para_server\n",
+	stat_item_values[SI_STATUS_BAR] = make_message(
+		"%s:no connection to para_server\n",
 		status_item_list[SI_STATUS_BAR]);
 	stat_client_write(stat_item_values[SI_STATUS_BAR], SI_STATUS_BAR);
 }
@@ -580,13 +565,21 @@ static void __noreturn clean_exit(int status, const char *msg)
 	exit(status);
 }
 
-/** get the number of filters for the given audio format */
+/**
+ * get the number of filters
+ *
+ * \param audio_format_num the number identifying the audio format
+ *
+ * \return the number of filters for the given audio format
+ *
+ * \sa struct filter;
+ */
 int num_filters(int audio_format_num)
 {
 	return afi[audio_format_num].num_filters;
 }
 
-void filter_event_handler(struct task *t)
+static void filter_event_handler(struct task *t)
 {
 	PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
 	unregister_task(t);
@@ -708,7 +701,7 @@ static void open_writer(int slot_num)
 	activate_inactive_grab_clients(slot_num, s->format, &s->fc->filters);
 }
 
-void rn_event_handler(struct task *t)
+static void rn_event_handler(struct task *t)
 {
 //	struct receiver_node *rn = t->private_data;
 	PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
@@ -865,7 +858,12 @@ static void handle_signal(int sig)
 {
 	switch (sig) {
 	case SIGCHLD:
-		return check_sigchld();
+		for (;;) {
+			pid_t pid = para_reap_child();
+			if (pid <= 0)
+				return;
+			PARA_CRIT_LOG("para_client died (pid %d)\n", pid);
+		}
 	case SIGINT:
 	case SIGTERM:
 	case SIGHUP:
@@ -990,41 +988,6 @@ static int add_filter(int format, char *cmdline)
 	return filter_num;
 }
 
-static int setup_default_filters(void)
-{
-	int i, ret = 1;
-
-	FOR_EACH_AUDIO_FORMAT(i) {
-		struct audio_format_info *a = &afi[i];
-		char *tmp;
-		int j;
-		if (a->num_filters)
-			continue;
-		/* add "dec" to audio format name */
-		tmp = make_message("%sdec", audio_formats[i]);
-		for (j = 0; filters[j].name; j++)
-			if (!strcmp(tmp, filters[j].name))
-				break;
-		free(tmp);
-		ret = -E_UNSUPPORTED_FILTER;
-		if (!filters[j].name)
-			goto out;
-		tmp = para_strdup(filters[j].name);
-		ret = add_filter(i, tmp);
-		free(tmp);
-		if (ret < 0)
-			goto out;
-		PARA_INFO_LOG("%s -> default filter: %s\n", audio_formats[i],
-			filters[j].name);
-		ret = add_filter(i, "wav");
-		if (ret < 0)
-			goto out;
-		PARA_INFO_LOG("%s -> default filter: wav\n", audio_formats[i]);
-	}
-out:
-	return ret;
-}
-
 static int init_writers(void)
 {
 	int i, ret, nw;
@@ -1033,7 +996,7 @@ static int init_writers(void)
 
 	init_supported_writers();
 	nw = PARA_MAX(1, conf.writer_given);
-	PARA_INFO_LOG("allocating space for %d writers\n", nw);
+	PARA_INFO_LOG("maximal number of writers: %d\n", nw);
 	FOR_EACH_AUDIO_FORMAT(i) {
 		a = &afi[i];
 		a->writer_conf = para_malloc(nw * sizeof(void *));
@@ -1111,19 +1074,52 @@ out:
 	free(cmd);
 	return ret;
 }
+
+static int init_default_filters(void)
+{
+	int i, ret = 1;
+
+	FOR_EACH_AUDIO_FORMAT(i) {
+		struct audio_format_info *a = &afi[i];
+		char *tmp;
+		int j;
+
+		if (a->num_filters)
+			continue; /* no default -- nothing to to */
+		/* add "dec" to audio format name */
+		tmp = make_message("%sdec", audio_formats[i]);
+		for (j = 0; filters[j].name; j++)
+			if (!strcmp(tmp, filters[j].name))
+				break;
+		free(tmp);
+		ret = -E_UNSUPPORTED_FILTER;
+		if (!filters[j].name)
+			goto out;
+		tmp = para_strdup(filters[j].name);
+		ret = add_filter(i, tmp);
+		free(tmp);
+		if (ret < 0)
+			goto out;
+		PARA_INFO_LOG("%s -> default filter: %s\n", audio_formats[i],
+			filters[j].name);
+	}
+out:
+	return ret;
+}
+
 static int init_filters(void)
 {
 	int i, ret, nf;
 
 	filter_init(filters);
-	nf = PARA_MAX(2,  conf.filter_given) + 1;
-	PARA_INFO_LOG("allocating space for %d filters\n", nf);
+	nf = PARA_MAX(1,  conf.filter_given);
+	PARA_INFO_LOG("maximal number of filters: %d\n", nf);
 	FOR_EACH_AUDIO_FORMAT(i) {
 		afi[i].filter_conf = para_malloc(nf * sizeof(void *));
 		afi[i].filters = para_malloc(nf * sizeof(struct filter *));
 	}
 	if (!conf.no_default_filters_given)
-		return setup_default_filters();
+		return init_default_filters();
 	for (i = 0; i < conf.filter_given; i++) {
 		char *arg = conf.filter_arg[i];
 		char *filter_name = strchr(arg, ':');
@@ -1139,7 +1135,7 @@ static int init_filters(void)
 		if (ret < 0)
 			goto out;
 	}
-	ret = 1;
+	ret = init_default_filters(); /* use default values for the rest */
 out:
 	return ret;
 }
@@ -1533,7 +1529,7 @@ static void command_post_select(struct sched *s, struct task *t)
 		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
 }
 
-void init_command_task(struct command_task *ct)
+static void init_command_task(struct command_task *ct)
 {
 	ct->task.pre_select = command_pre_select;
 	ct->task.post_select = command_post_select;