X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=grab_client.c;h=77d3616d2c2e41b3caf32f5fea13d54cf778642b;hp=4be23d7807ad7e34f5a8cece9c58f0ae7971b536;hb=d27b31524e1d60ad4fdbeb606bba31ba0ee54048;hpb=95be781249848aefc58c8230dbfa537b9494f307 diff --git a/grab_client.c b/grab_client.c index 4be23d78..77d3616d 100644 --- a/grab_client.c +++ b/grab_client.c @@ -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; @@ -190,10 +190,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); }