#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;
// 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)
{
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;
gc->mode = i;
if (conf->audio_format_given) {
gc->audio_format_num = get_audio_format_num(conf->audio_format_arg);
* 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, int argc, char **argv, int *err)
{
int i, 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 *));
+ gc->argv = para_calloc((argc + 2) * sizeof(char *));
- for (i = 0; i < argc; i++) {
+ for (i = 0; argv[i]; 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);
*err = -E_GC_SYNTAX;
if (ret)