projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improved info status items for the playlist selector
[paraslash.git]
/
grab_client.c
diff --git
a/grab_client.c
b/grab_client.c
index 2a98b35f8831210280321cbb3a48ff984996dd65..026211fdcb9fca9c6e4e99b635e5de43c8592fb5 100644
(file)
--- a/
grab_client.c
+++ b/
grab_client.c
@@
-32,15
+32,7
@@
#include "audiod.h"
#include "error.h"
#include "string.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;
/** grab clients that are not yet attached to a filter node */
struct list_head inactive_grab_client_list;
@@
-51,7
+43,7
@@
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));
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("maximal filter chain length: %d\n", ret);
return ret;
@@
-65,12
+57,10
@@
static int gc_write(char *buf, size_t len, struct filter_callback *fcb)
// PARA_INFO_LOG("writing %d bytes to fd %d\n", len, gc->fd);
fd_set wfds;
// 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)
if (gc->mode == GRAB_PEDANTIC)
return -E_PEDANTIC_GRAB;
if (gc->mode == GRAB_SLOPPY)
@@
-95,18
+85,21
@@
rewrite:
return ret;
}
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;
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);
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;
break;
- if (!
gc_modes
[i])
- return -E_
INVALID_GRAB_MODE
;
+ if (!
mv
[i])
+ return -E_
GC_SYNTAX
;
gc->mode = i;
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)
if (conf->audio_format_given) {
gc->audio_format_num = get_audio_format_num(conf->audio_format_arg);
if (gc->audio_format_num < 0)
@@
-242,20
+235,19
@@
void activate_inactive_grab_clients(int slot, int audio_format_num,
* argc, argv get freed when com_grab() returns, so we have to make a
* copy.
*/
* 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;
{
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]);
}
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)
ret = grab_client_cmdline_parser(gc->argc, gc->argv , gc->conf);
*err = -E_GC_SYNTAX;
if (ret)
@@
-263,6
+255,9
@@
__malloc struct grab_client *grab_client_new(int fd, int argc, char **argv, int
*err = -E_GC_HELP_GIVEN;
if (gc->conf->help_given)
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;
*err = check_gc_args(gc);
if (*err < 0)
goto err_out;