projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a bug in the output of para_audioc.
[paraslash.git]
/
grab_client.c
diff --git
a/grab_client.c
b/grab_client.c
index 4be23d7807ad7e34f5a8cece9c58f0ae7971b536..9b4ef69c5f4dae98409f707959abcdb9ca8b13c9 100644
(file)
--- a/
grab_client.c
+++ b/
grab_client.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2006-200
8
Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-200
9
Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* 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 "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 "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;
/** 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;
{
int i;
struct grab_client_args_info *c = gc->conf;
- char **mv = grab_client_cmdline_parser_mode_values;
+ c
onst c
har **mv = grab_client_cmdline_parser_mode_values;
PARA_INFO_LOG("filter_num: %d\n", c->filter_num_arg);
for (i = 0; mv[i]; i++)
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 (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;
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) {
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
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;
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;
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;
continue;
- if (filter_num < 0)
- filter_num = 0;
fn = fc->filter_nodes + filter_num;
activate_grab_client(gc, fn);
}
fn = fc->filter_nodes + filter_num;
activate_grab_client(gc, fn);
}