para_play: introduce struct private_alsa_data

[paraslash.git] / grab_client.c

diff --git a/grab_client.c b/grab_client.c
index 2dfb295b8ce87fcb5f165bcfd4b3c25f3bdb5b50..ee07d875e085a591437465eca3ef330deddc2bc1 100644 (file)
--- a/grab_client.c
+++ b/grab_client.c
@@ -32,6 +32,7 @@
 #include "audiod.h"
 #include "error.h"
 #include "string.h"
+#include "fd.h"
 
 /** grab clients that are not yet attached to a filter node */
 struct list_head inactive_grab_client_list;
@@ -42,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));
-               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;
@@ -56,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;
-       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)
@@ -232,20 +231,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.
  */
-__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)