/*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
*
- * 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 <sys/types.h>
+#include <dirent.h>
+
#include "para.h"
-#include "close_on_fork.h"
#include "grab_client.cmdline.h"
#include "list.h"
+#include "sched.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 */
+/** Grab clients that are not yet attached to a filter node. */
struct list_head inactive_grab_client_list;
static int max_num_filters(void)
for (i = 0; audio_formats[i]; i++) {
PARA_INFO_LOG("%s filter chain length: %d\n", audio_formats[i],
num_filters(i));
- ret = MAX(ret, num_filters(i));
+ ret = PARA_MAX(ret, num_filters(i));
}
PARA_INFO_LOG("maximal filter chain length: %d\n", ret);
return ret;
// PARA_INFO_LOG("writing %d bytes to fd %d\n", len, gc->fd);
fd_set wfds;
- do {
- FD_ZERO(&wfds);
- FD_SET(gc->fd, &wfds);
- ret = select(gc->fd + 1, NULL, &wfds, NULL, &tv);
- } while (ret == EAGAIN || ret == EINTR);
- if (ret != 1) {
+ FD_ZERO(&wfds);
+ FD_SET(gc->fd, &wfds);
+ ret = para_select(gc->fd + 1, NULL, &wfds, &tv);
+ if (ret <= 0) {
if (gc->mode == GRAB_PEDANTIC)
return -E_PEDANTIC_GRAB;
if (gc->mode == GRAB_SLOPPY)
return ret;
}
+/* TODO: gengetopt can handle the grab client modes */
static int check_gc_args(struct grab_client *gc)
{
int i;
- struct grab_client_args_info *conf = gc->conf;
+ struct grab_client_args_info *c = gc->conf;
char **mv = grab_client_cmdline_parser_mode_values;
- PARA_INFO_LOG("filter_num: %d\n", gc->conf->filter_num_arg);
+ PARA_INFO_LOG("filter_num: %d\n", c->filter_num_arg);
for (i = 0; mv[i]; i++)
- if (!strcmp(conf->mode_arg, mv[i]))
+ if (!strcmp(c->mode_arg, mv[i]))
break;
+ if (!mv[i])
+ return -E_GC_SYNTAX;
gc->mode = i;
- if (conf->audio_format_given) {
- gc->audio_format_num = get_audio_format_num(conf->audio_format_arg);
+ gc->audio_format_num = -1;
+ if (c->audio_format_given) {
+ gc->audio_format_num = get_audio_format_num(c->audio_format_arg);
if (gc->audio_format_num < 0)
return gc->audio_format_num;
}
- if (conf->slot_arg > MAX_STREAM_SLOTS)
+ if (c->slot_arg > MAX_STREAM_SLOTS)
return -E_BAD_GC_SLOT;
- if (conf->filter_num_arg <= 0)
+ if (c->filter_num_arg <= 0)
return -E_BAD_GC_FILTER_NUM;
- if (conf->audio_format_given) {
- if (num_filters(gc->audio_format_num) < conf->filter_num_arg)
+ if (c->audio_format_given) {
+ if (num_filters(gc->audio_format_num) < c->filter_num_arg)
return -E_BAD_GC_FILTER_NUM;
} else
- if (conf->filter_num_arg > max_num_filters())
+ if (c->filter_num_arg > max_num_filters())
return -E_BAD_GC_FILTER_NUM;
return 1;
{
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)
if (gc->conf->one_shot_given || gc->error) {
PARA_INFO_LOG("closing fd %d (grab client %p)\n", gc->fd, gc);
- del_close_on_fork_list(gc->fd);
close(gc->fd);
gc_free(gc);
/* close on fork ?*/
}
/**
- * 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 filter_list The list of activated filters for that new audio file.
*
* 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
* 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, int audio_format_num,
+void activate_inactive_grab_clients(int slot_num, int audio_format_num,
struct list_head *filter_list)
{
struct grab_client *gc, *tmp;
list_for_each_entry_safe(gc, tmp, &inactive_grab_client_list, node) {
// PARA_INFO_LOG("checking inactive grab client %p\n", gc);
- if (gc->conf->slot_arg >= 0 && gc->conf->slot_arg != slot)
+ if (gc->conf->slot_arg >= 0 && gc->conf->slot_arg != slot_num)
continue;
if (gc->audio_format_num >= 0 && gc->audio_format_num !=
audio_format_num)
}
/**
- * 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 argc the number of command line options
- * \param argv pointers to the command line options
- * \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.
+ * 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
* configuration. Moreover, add the new grab client to the inactive list.
*
* 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
* copy.
*/
-__malloc struct grab_client *grab_client_new(int fd, int argc, char **argv, int *err)
+struct grab_client *grab_client_new(int fd, char *line, int *err)
{
- int i, ret;
+ int ret;
struct grab_client *gc = para_calloc(sizeof(struct grab_client));
gc->conf = para_calloc(sizeof(struct grab_client_args_info));
- gc->argc = argc;
- gc->argv = para_calloc((argc + 1) * sizeof(char *));
- for (i = 0; i < argc; i++) {
- gc->argv[i] = para_strdup(argv[i]);
- PARA_INFO_LOG("argc: %d, argv[%d]: %s\n", argc, i, gc->argv[i]);
- }
- PARA_INFO_LOG("argv[%d]: %s\n", argc, gc->argv[argc]);
- ret = grab_client_cmdline_parser(gc->argc, gc->argv , gc->conf);
+ ret = grab_client_cmdline_parser_string(line, gc->conf, "grab");
*err = -E_GC_SYNTAX;
if (ret)
goto err_out;
add_inactive_gc(gc);
return gc;
err_out:
- for (i = 0; i < argc; i++)
- free(gc->argv[i]);
- free(gc->argv);
free(gc->conf);
free(gc);
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");
INIT_LIST_HEAD(&inactive_grab_client_list);
}
-
projects / paraslash.git / blobdiff