Merge branch 'sched'

[paraslash.git] / grab_client.c

diff --git a/grab_client.c b/grab_client.c
index ee07d875e085a591437465eca3ef330deddc2bc1..f505fa8739070d4a9a01563c2e60a8395fdea70a 100644 (file)
--- a/grab_client.c
+++ b/grab_client.c
@@ -27,6 +27,7 @@
 #include "close_on_fork.h"
 #include "grab_client.cmdline.h"
 #include "list.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 "filter.h"
 #include "grab_client.h"
 #include "audiod.h"


@@ -85,6 +86,7 @@ rewrite:
        return ret;
 }
 
        return ret;
 }
 

+/* TODO: gengetopt can handle the grab client modes */

 static int check_gc_args(struct grab_client *gc)
 {
        int i;
 static int check_gc_args(struct grab_client *gc)
 {
        int i;


@@ -95,7 +97,10 @@ static int check_gc_args(struct grab_client *gc)
        for (i = 0; mv[i]; i++)
                if (!strcmp(conf->mode_arg, mv[i]))
                        break;
        for (i = 0; mv[i]; i++)
                if (!strcmp(conf->mode_arg, mv[i]))
                        break;

+       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)


@@ -213,11 +218,10 @@ void activate_inactive_grab_clients(int slot, int audio_format_num,
  * check the command line options and allocate a grab_client structure
  *
  * \param fd the file descriptor of the client
  * 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
  *
  * \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.
  *
  * allocate a struct grab_client and initialize it with this valid
  * configuration. Moreover, add the new grab client to the inactive list.
  *


@@ -231,20 +235,14 @@ 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.
  */

-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));
        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 + 2) * sizeof(char *));

 
 

-       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]);
-       }
-       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_SYNTAX;
        if (ret)
                goto err_out;


@@ -270,9 +268,6 @@ struct grab_client *grab_client_new(int fd, int argc, char **argv, int *err)
        add_inactive_gc(gc);
        return gc;
 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;
        free(gc->conf);
        free(gc);
        return NULL;