X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=grab_client.c;h=9b4ef69c5f4dae98409f707959abcdb9ca8b13c9;hp=efe9cf613b13720684b24cf2a0db85799fcd3aef;hb=0322a7faaf28dfc2b4d545586926adfae7bf036e;hpb=c839ef92e35d5604748aa4674b400156ff7baced diff --git a/grab_client.c b/grab_client.c index efe9cf61..9b4ef69c 100644 --- a/grab_client.c +++ b/grab_client.c @@ -1,32 +1,24 @@ /* - * Copyright (C) 2006 Andre Noll + * Copyright (C) 2006-2009 Andre Noll * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** - * \file grab_client.c functions for grabbing the stream at any position - * in a filter chain + * \file grab_client.c Functions for grabbing the stream at any position + * in a filter chain. * - * \sa filter_chain filter_chain_info filter + * \sa filter_chain filter_chain_info filter. */ +#include +#include + #include "para.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" @@ -34,7 +26,7 @@ #include "string.h" #include "fd.h" -/** grab clients that are not yet attached to a filter node */ +/** Grab clients that are not yet attached to a filter node. */ struct list_head inactive_grab_client_list; static int max_num_filters(void) @@ -90,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++) @@ -105,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; @@ -123,7 +115,7 @@ static void add_inactive_gc(struct grab_client *gc) { PARA_INFO_LOG("adding grab client %p (fd %d) to inactive list\n", gc, gc->fd); - list_add(&gc->node, &inactive_grab_client_list); + para_list_add(&gc->node, &inactive_grab_client_list); } static void gc_free(struct grab_client *gc) @@ -153,26 +145,26 @@ static void gc_close(struct filter_callback *fcb) } /** - * move a grab client from the inactive list to a filter node + * Move a grab client from the inactive list to a filter node. * - * \param gc the grab client to activate - * \param fn the filter node \a gc gets attached to + * \param gc The grab client to activate. + * \param fn The filter node \a gc gets attached to. * - * \sa filter_node::callbacks, inactive_grab_client_list + * \sa filter_node::callbacks, inactive_grab_client_list. */ void activate_grab_client(struct grab_client *gc, struct filter_node *fn) { PARA_INFO_LOG("activating %p (fd %d, filter node: %p)\n", gc, gc->fd, fn); list_del(&gc->node); - list_add(&gc->fcb.node, &fn->callbacks); + para_list_add(&gc->fcb.node, &fn->callbacks); } /** - * activate inactive grab clients if possible + * Activate inactive grab clients if possible. * - * \param slot 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 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 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 @@ -181,13 +173,13 @@ void activate_grab_client(struct grab_client *gc, struct filter_node *fn) * appropriate filter_node. * * \sa filter_chain_info::filters, inactive_grab_client_list, - * activate_grab_client + * 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; + int filter_num; struct filter_node *fn; list_for_each_entry_safe(gc, tmp, &inactive_grab_client_list, node) { @@ -197,27 +189,20 @@ 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; - i = 1; - list_for_each_entry(fn, filter_list, node) { - if (gc->conf->filter_num_arg <= 0 - || i == gc->conf->filter_num_arg) - break; - i++; - } + fn = fc->filter_nodes + filter_num; activate_grab_client(gc, fn); } } /** - * check the command line options and allocate a grab_client structure + * Check the command line options and allocate a grab_client structure. * - * \param fd the file descriptor of the client - * \param line the command line - * \param err non-zero if an error occured + * \param fd The file descriptor of the client. + * \param line The command line. + * \param err Non-zero if an error occurred. * * If the command line options given by \a argc and \a argv are valid. * allocate a struct grab_client and initialize it with this valid @@ -227,7 +212,7 @@ void activate_inactive_grab_clients(int slot_num, int audio_format_num, * struct. On errors, it returns NULL and sets \a err appropriately. * * \sa grab_client, inactive_grab_client_list, activate_grab_client, - * filter_node::callbacks + * filter_node::callbacks. */ /* * argc, argv get freed when com_grab() returns, so we have to make a @@ -271,14 +256,14 @@ err_out: return NULL; } -/** initialize the grabbing subsystem. +/** + * Initialize the grabbing subsystem. * * This has to be called once during startup before any other function from * grab_client.c may be used. It initializes \a inactive_grab_client_list. */ -void init_grabbing() +void init_grabbing(void) { - PARA_INFO_LOG("%s", "grab init\n"); + PARA_INFO_LOG("grab init\n"); INIT_LIST_HEAD(&inactive_grab_client_list); } -