X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=b4c50dc86118a6d9f3c756f7d6b2c40a87c34ca9;hp=855e5cea102e51076b50ad345d014096d9c08e4a;hb=39bb1a102b14e3f230a659290622b2d1b1658b44;hpb=84f3cda92d0fb3d072b1a2d9bf8c2156c18d6398

diff --git a/audiod_command.c b/audiod_command.c
index 855e5cea..b4c50dc8 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -279,8 +279,7 @@ out:
 
 static struct filter_node *find_filter_node(int slot_num, int format, int filternum)
 {
-	struct filter_node *fn;
-	int i, j;
+	int i;
 
 	FOR_EACH_SLOT(i) {
 		struct slot_info *s = &slot[i];
@@ -290,14 +289,10 @@ static struct filter_node *find_filter_node(int slot_num, int format, int filter
 			continue;
 		if (format >= 0 && s->format != format)
 			continue;
-		if (num_filters(i) < filternum)
+		if (num_filters(i) <= filternum)
 			continue;
 		/* success */
-		j = 1;
-		list_for_each_entry(fn, &s->fc->filters, node)
-			if (filternum <= 0 || j++ == filternum)
-				break;
-		return fn;
+		return  s->fc->filter_nodes + filternum;
 	}
 	return NULL;
 }
@@ -461,7 +456,7 @@ out:
 	free(buf);
 	free(argv);
 	if (clifd > 0 && ret < 0 && ret != -E_CLIENT_WRITE) {
-		char *tmp = make_message("%s\n", PARA_STRERROR(-ret));
+		char *tmp = make_message("%s\n", para_strerror(-ret));
 		client_write(clifd, tmp);
 		free(tmp);
 		close(clifd);