X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=filter_common.c;h=e9b97e54633a8770009c0f746b7daa712d4135fb;hp=6db0c57f6a062f923abdb2eafb807d0a547eff82;hb=dda88dcb390a44e1f1f68f6248ed513c75dce4bf;hpb=36ec2a43a7d9c085f16544e282a439cdbaec1e00

diff --git a/filter_common.c b/filter_common.c
index 6db0c57f..e9b97e54 100644
--- a/filter_common.c
+++ b/filter_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2014 Andre Noll <maan@tuebingen.mpg.de>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -19,8 +19,28 @@
 #include "error.h"
 #include "string.h"
 
+/** Iterate over the array of supported filters. */
+#define FOR_EACH_SUPPORTED_FILTER(j)  for (j = 0; j < NUM_SUPPORTED_FILTERS; j++)
+
 /** The array of supported filters. */
-struct filter filters[NUM_SUPPORTED_FILTERS] = {FILTER_ARRAY};
+static struct filter filters[NUM_SUPPORTED_FILTERS] = {FILTER_ARRAY};
+
+/**
+ * Obtain a reference to a filter structure.
+ *
+ * \param filter_num Between zero and NUM_SUPPORTED_FILTERS, inclusively.
+ *
+ * \return Pointer to the filter identified by the given filter number.
+ *
+ * It is a fatal error if the given number is out of range. In this case
+ * the function aborts.
+ */
+const struct filter *filter_get(int filter_num)
+{
+	assert(filter_num >= 0);
+	assert(filter_num < NUM_SUPPORTED_FILTERS);
+	return filters + filter_num;
+}
 
 /**
  * Call the init function of each supported filter.
@@ -31,16 +51,16 @@ void filter_init(void)
 	int i;
 
 	FOR_EACH_SUPPORTED_FILTER(i)
-		filters[i].init(filters + i);
+		filter_get(i)->init((struct filter *)filter_get(i));
 }
 
 /*
  * If the filter has a command line parser and options is not NULL, run it.
  * Returns filter_num on success, negative on errors
  */
-static int parse_filter_args(int filter_num, char *options, void **conf)
+static int parse_filter_args(int filter_num, const char *options, void **conf)
 {
-	struct filter *f = &filters[filter_num];
+	const struct filter *f = filter_get(filter_num);
 	int ret, argc;
 	char **argv;
 
@@ -58,11 +78,12 @@ static int parse_filter_args(int filter_num, char *options, void **conf)
 /**
  * Check the filter command line options.
  *
- * \param fa The command line options.
+ * \param fa The filter argument.
  * \param conf Points to the filter configuration upon successful return.
  *
- * Check if \a fa starts with a the name of a supported filter, followed by
- * a colon. If yes, call the command line parser of that filter.
+ * Check if the given filter argument starts with the name of a supported
+ * filter, optionally followed by options for this filter. If yes, call the
+ * command line parser of that filter.
  *
  * \return On success, the number of the filter is returned and \a conf
  * is initialized to point to the filter configuration determined by \a fa.
@@ -73,14 +94,14 @@ static int parse_filter_args(int filter_num, char *options, void **conf)
  *
  * \sa filter::parse_config
  */
-int check_filter_arg(char *fa, void **conf)
+int check_filter_arg(const char *fa, void **conf)
 {
 	int j;
 
 	*conf = NULL;
 //	PARA_DEBUG_LOG("arg: %s\n", fa);
 	FOR_EACH_SUPPORTED_FILTER(j) {
-		const char *name = filters[j].name;
+		const char *name = filter_get(j)->name;
 		size_t len = strlen(name);
 		char c;
 		if (strlen(fa) < len)
@@ -90,7 +111,7 @@ int check_filter_arg(char *fa, void **conf)
 		c = fa[len];
 		if (c && c != ' ')
 			continue;
-		if (c && !filters[j].parse_config)
+		if (c && !filter_get(j)->parse_config)
 			return -E_BAD_FILTER_OPTIONS;
 		return parse_filter_args(j, c? fa + len + 1 :
 			fa + strlen(fa), conf);
@@ -113,12 +134,12 @@ void print_filter_helps(unsigned flags)
 			printf_or_die("\n                  ");
 			num = 0;
 		}
-		num += printf_or_die("%s%s", i? " " : "", filters[i].name);
+		num += printf_or_die("%s%s", i? " " : "", filter_get(i)->name);
 	}
 	printf_or_die("\n");
 
 	FOR_EACH_SUPPORTED_FILTER(i) {
-		struct filter *f = filters + i;
+		struct filter *f = (struct filter *)filter_get(i);
 
 		if (!f->help.short_help)
 			continue;
@@ -183,7 +204,7 @@ int decoder_execute(const char *cmd, unsigned sample_rate, unsigned channels,
 		return 1;
 	}
 	if (!strcmp(cmd, "sample_format")) {
-		*result = make_message("%u", DECODER_SAMPLE_FORMAT);
+		*result = make_message("%d", DECODER_SAMPLE_FORMAT);
 		return 1;
 	}
 	return -ERRNO_TO_PARA_ERROR(ENOTSUP);