X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=grab_client.c;h=9b4ef69c5f4dae98409f707959abcdb9ca8b13c9;hp=e348ea2be63ba36e9dd727c5db1924946af2a9ae;hb=b6100d88b5a03e824991b4a5bfd90b0e951e8d2b;hpb=63b57e3e60923cea4e3e1808e3133789db2dc83a

diff --git a/grab_client.c b/grab_client.c
index e348ea2b..9b4ef69c 100644
--- a/grab_client.c
+++ b/grab_client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -18,13 +18,13 @@
 #include "grab_client.cmdline.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "filter.h"
 #include "grab_client.h"
 #include "audiod.h"
 #include "error.h"
 #include "string.h"
 #include "fd.h"
-#include "crypt.h"
 
 /** Grab clients that are not yet attached to a filter node. */
 struct list_head inactive_grab_client_list;
@@ -82,7 +82,7 @@ static int check_gc_args(struct grab_client *gc)
 {
 	int i;
 	struct grab_client_args_info *c = gc->conf;
-	char **mv = grab_client_cmdline_parser_mode_values;
+	const char **mv = grab_client_cmdline_parser_mode_values;
 
 	PARA_INFO_LOG("filter_num: %d\n", c->filter_num_arg);
 	for (i = 0; mv[i]; i++)
@@ -97,15 +97,15 @@ static int check_gc_args(struct grab_client *gc)
 		if (gc->audio_format_num < 0)
 			return gc->audio_format_num;
 	}
-	if (c->slot_arg > MAX_STREAM_SLOTS)
+	if (c->slot_arg >= MAX_STREAM_SLOTS)
 		return -E_BAD_GC_SLOT;
-	if (c->filter_num_arg <= 0)
+	if (c->filter_num_arg < 0)
 		return -E_BAD_GC_FILTER_NUM;
 	if (c->audio_format_given) {
-		if (num_filters(gc->audio_format_num) < c->filter_num_arg)
+		if (num_filters(gc->audio_format_num) <= c->filter_num_arg)
 			return -E_BAD_GC_FILTER_NUM;
 	} else
-		if (c->filter_num_arg > max_num_filters())
+		if (c->filter_num_arg >= max_num_filters())
 			return -E_BAD_GC_FILTER_NUM;
 
 	return 1;
@@ -164,7 +164,7 @@ void activate_grab_client(struct grab_client *gc, struct filter_node *fn)
  *
  * \param slot_num Audiod's slot for the new audio file.
  * \param audio_format_num The number of the audio format of the new audio file.
- * \param filter_list The list of activated filters for that new audio file.
+ * \param fc The filter chain containing the activated filters.
  *
  * This is called from audiod.c when the current audio file changes. It loops
  * over all inactive grab clients and checks each grab client's configuration
@@ -179,7 +179,7 @@ void activate_inactive_grab_clients(int slot_num, int audio_format_num,
 		struct filter_chain *fc)
 {
 	struct grab_client *gc, *tmp;
-	int i;
+	int filter_num;
 	struct filter_node *fn;
 
 	list_for_each_entry_safe(gc, tmp, &inactive_grab_client_list, node) {
@@ -189,15 +189,10 @@ void activate_inactive_grab_clients(int slot_num, int audio_format_num,
 		if (gc->audio_format_num >= 0 && gc->audio_format_num !=
 				audio_format_num)
 			continue;
-		if (gc->conf->filter_num_arg >= 0 &&
-				num_filters(gc->audio_format_num)
-				< gc->conf->filter_num_arg)
+		filter_num = gc->conf->filter_num_arg;
+		if (filter_num >= num_filters(gc->audio_format_num))
 			continue;
-		FOR_EACH_FILTER_NODE(fn, fc, i) {
-			if (gc->conf->filter_num_arg <= 0
-				|| i == gc->conf->filter_num_arg + 1)
-				break;
-		}
+		fn = fc->filter_nodes + filter_num;
 		activate_grab_client(gc, fn);
 	}
 }