audiod: Improve receiver restart logic.

[paraslash.git] / grab_client.c

diff --git a/grab_client.c b/grab_client.c
index 4be23d7807ad7e34f5a8cece9c58f0ae7971b536..e419a723b9b856ddbc595c6130951c86d4e3155a 100644 (file)
--- 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,6 +18,7 @@
 #include "grab_client.cmdline.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "filter.h"
 #include "grab_client.h"
 #include "audiod.h"
@@ -97,15 +98,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;
@@ -190,10 +191,8 @@ void activate_inactive_grab_clients(int slot_num, int audio_format_num,
                                audio_format_num)
                        continue;
                filter_num = gc->conf->filter_num_arg;
-               if (filter_num >= 0 && filter_num >= num_filters(gc->audio_format_num))
+               if (filter_num >= num_filters(gc->audio_format_num))
                        continue;
-               if (filter_num < 0)
-                       filter_num = 0;
                fn = fc->filter_nodes + filter_num;
                activate_grab_client(gc, fn);
        }