projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
colorful blackness gui theme: adjust field with for 80 chars terminals
[paraslash.git]
/
grab_client.c
diff --git
a/grab_client.c
b/grab_client.c
index b58c456e89c3545e590439a96afdb8d2ad40a071..70b95f4f655b174db266809428f5f0667e6bc2e2 100644
(file)
--- a/
grab_client.c
+++ b/
grab_client.c
@@
-24,9
+24,9
@@
*/
#include "para.h"
*/
#include "para.h"
-#include "close_on_fork.h"
#include "grab_client.cmdline.h"
#include "list.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"
@@
-89,30
+89,31
@@
rewrite:
static int check_gc_args(struct grab_client *gc)
{
int i;
static int check_gc_args(struct grab_client *gc)
{
int i;
- struct grab_client_args_info *c
onf
= gc->conf;
+ struct grab_client_args_info *c = gc->conf;
char **mv = grab_client_cmdline_parser_mode_values;
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",
c
->filter_num_arg);
for (i = 0; mv[i]; i++)
for (i = 0; mv[i]; i++)
- if (!strcmp(c
onf
->mode_arg, mv[i]))
+ if (!strcmp(c->mode_arg, mv[i]))
break;
if (!mv[i])
return -E_GC_SYNTAX;
gc->mode = i;
break;
if (!mv[i])
return -E_GC_SYNTAX;
gc->mode = i;
- if (conf->audio_format_given) {
- gc->audio_format_num = get_audio_format_num(conf->audio_format_arg);
+ gc->audio_format_num = -1;
+ if (c->audio_format_given) {
+ gc->audio_format_num = get_audio_format_num(c->audio_format_arg);
if (gc->audio_format_num < 0)
return gc->audio_format_num;
}
if (gc->audio_format_num < 0)
return gc->audio_format_num;
}
- if (c
onf
->slot_arg > MAX_STREAM_SLOTS)
+ if (c->slot_arg > MAX_STREAM_SLOTS)
return -E_BAD_GC_SLOT;
return -E_BAD_GC_SLOT;
- if (c
onf
->filter_num_arg <= 0)
+ if (c->filter_num_arg <= 0)
return -E_BAD_GC_FILTER_NUM;
return -E_BAD_GC_FILTER_NUM;
- if (c
onf
->audio_format_given) {
- if (num_filters(gc->audio_format_num) < c
onf
->filter_num_arg)
+ if (c->audio_format_given) {
+ if (num_filters(gc->audio_format_num) < c->filter_num_arg)
return -E_BAD_GC_FILTER_NUM;
} else
return -E_BAD_GC_FILTER_NUM;
} else
- if (c
onf
->filter_num_arg > max_num_filters())
+ if (c->filter_num_arg > max_num_filters())
return -E_BAD_GC_FILTER_NUM;
return 1;
return -E_BAD_GC_FILTER_NUM;
return 1;
@@
-143,7
+144,6
@@
static void gc_close(struct filter_callback *fcb)
if (gc->conf->one_shot_given || gc->error) {
PARA_INFO_LOG("closing fd %d (grab client %p)\n", gc->fd, gc);
if (gc->conf->one_shot_given || gc->error) {
PARA_INFO_LOG("closing fd %d (grab client %p)\n", gc->fd, gc);
- del_close_on_fork_list(gc->fd);
close(gc->fd);
gc_free(gc);
/* close on fork ?*/
close(gc->fd);
gc_free(gc);
/* close on fork ?*/
@@
-170,7
+170,7
@@
void activate_grab_client(struct grab_client *gc, struct filter_node *fn)
/**
* activate inactive grab clients if possible
*
/**
* activate inactive grab clients if possible
*
- * \param slot audiod's slot for the new audio file
+ * \param slot
_num
audiod's slot for the new audio file
* \param audio_format_num the number of the audio format of the new audio file
* \param filter_list the list of activated filters for that new audio file
*
* \param audio_format_num the number of the audio format of the new audio file
* \param filter_list the list of activated filters for that new audio file
*
@@
-183,7
+183,7
@@
void activate_grab_client(struct grab_client *gc, struct filter_node *fn)
* \sa filter_chain_info::filters, inactive_grab_client_list,
* activate_grab_client
*/
* \sa filter_chain_info::filters, inactive_grab_client_list,
* activate_grab_client
*/
-void activate_inactive_grab_clients(int slot, int audio_format_num,
+void activate_inactive_grab_clients(int slot
_num
, int audio_format_num,
struct list_head *filter_list)
{
struct grab_client *gc, *tmp;
struct list_head *filter_list)
{
struct grab_client *gc, *tmp;
@@
-192,7
+192,7
@@
void activate_inactive_grab_clients(int slot, int audio_format_num,
list_for_each_entry_safe(gc, tmp, &inactive_grab_client_list, node) {
// PARA_INFO_LOG("checking inactive grab client %p\n", gc);
list_for_each_entry_safe(gc, tmp, &inactive_grab_client_list, node) {
// PARA_INFO_LOG("checking inactive grab client %p\n", gc);
- if (gc->conf->slot_arg >= 0 && gc->conf->slot_arg != slot)
+ if (gc->conf->slot_arg >= 0 && gc->conf->slot_arg != slot
_num
)
continue;
if (gc->audio_format_num >= 0 && gc->audio_format_num !=
audio_format_num)
continue;
if (gc->audio_format_num >= 0 && gc->audio_format_num !=
audio_format_num)
@@
-216,11
+216,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.
*
@@
-234,20
+233,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;
@@
-273,9
+266,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;