#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"
-
-
-/** this maps the enum to the text used at the command line */
-static const char *gc_modes[] = {
- [GRAB_PEDANTIC] = "pedantic",
- [GRAB_SLOPPY] = "sloppy",
- [GRAB_AGGRESSIVE] = "aggressive",
- NULL
-};
+#include "fd.h"
/** grab clients that are not yet attached to a filter node */
struct list_head inactive_grab_client_list;
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;
+ char **mv = grab_client_cmdline_parser_mode_values;
PARA_INFO_LOG("filter_num: %d\n", gc->conf->filter_num_arg);
- for (i = 0; gc_modes[i]; i++)
- if (!strcmp(conf->mode_arg, gc_modes[i]))
+ for (i = 0; mv[i]; i++)
+ if (!strcmp(conf->mode_arg, mv[i]))
break;
- if (!gc_modes[i])
- return -E_INVALID_GRAB_MODE;
+ if (!mv[i])
+ return -E_GC_SYNTAX;
gc->mode = i;
+ gc->audio_format_num = -1;
if (conf->audio_format_given) {
gc->audio_format_num = get_audio_format_num(conf->audio_format_arg);
if (gc->audio_format_num < 0)
* 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 line the command line
* \param err non-zero if an error occured
*
- * 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.
*
* 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;
*err = -E_GC_HELP_GIVEN;
if (gc->conf->help_given)
goto err_out;
+ *err = -E_GC_VERSION_GIVEN;
+ if (gc->conf->version_given)
+ goto err_out;
*err = check_gc_args(gc);
if (*err < 0)
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;