X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=grab_client.c;h=13b066b170dd0fb0c87a8bee88a2045a030a3bec;hp=926e8fd1aaf75fbf19993be5f1f42b013e583821;hb=3cd38df0574ccdb7e6d941500ba9a96e003196aa;hpb=c8862b9e246b4ef6ff1fe103946e18cf2537ecde diff --git a/grab_client.c b/grab_client.c index 926e8fd1..13b066b1 100644 --- a/grab_client.c +++ b/grab_client.c @@ -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 @@ -176,7 +176,7 @@ void activate_grab_client(struct grab_client *gc, struct filter_node *fn) * activate_grab_client. */ void activate_inactive_grab_clients(int slot_num, int audio_format_num, - struct list_head *filter_list) + struct filter_chain *fc) { struct grab_client *gc, *tmp; int i; @@ -193,12 +193,10 @@ void activate_inactive_grab_clients(int slot_num, int audio_format_num, num_filters(gc->audio_format_num) < gc->conf->filter_num_arg) continue; - i = 1; - list_for_each_entry(fn, filter_list, node) { + FOR_EACH_FILTER_NODE(fn, fc, i) { if (gc->conf->filter_num_arg <= 0 - || i == gc->conf->filter_num_arg) + || i == gc->conf->filter_num_arg + 1) break; - i++; } activate_grab_client(gc, fn); } @@ -271,6 +269,6 @@ err_out: */ void init_grabbing(void) { - PARA_INFO_LOG("%s", "grab init\n"); + PARA_INFO_LOG("grab init\n"); INIT_LIST_HEAD(&inactive_grab_client_list); }