/*
- * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2013 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include <regex.h>
#include <sys/types.h>
-#include <dirent.h>
-#include <stdbool.h>
#include "para.h"
#include "list.h"
};
/* Grab clients that are attached to a btr node. */
-INITIALIZED_LIST_HEAD(active_grab_client_list);
+static INITIALIZED_LIST_HEAD(active_grab_client_list);
/* Grab clients that are not currently attached any btr node. */
-INITIALIZED_LIST_HEAD(inactive_grab_client_list);
+static INITIALIZED_LIST_HEAD(inactive_grab_client_list);
static int gc_write(struct grab_client *gc, char *buf, size_t len)
{
if (gc->mode == GM_SLOPPY)
return len;
}
- ret = write_nonblock(gc->fd, buf, len);
+ ret = xwrite(gc->fd, buf, len);
if (ret < 0)
goto err;
if (ret > 0)
*
* \param gc The grab client to activate.
*/
-static void gc_activate(struct grab_client *gc)
+static void gc_activate(struct grab_client *gc, struct sched *s)
{
struct btr_node *root = audiod_get_btr_root(), *parent;
char *name = gc->name? gc->name : "grab";
snprintf(gc->task.status, sizeof(gc->task.status) - 1, "%s", name);
gc->task.status[sizeof(gc->task.status) - 1] = '\0';
gc->task.error = 0;
- register_task(&gc->task);
+ register_task(s, &gc->task);
}
/**
* Activate inactive grab clients if possible.
*
+ * \param s Needed to schedule the grab client task.
+ *
* This is called from audiod.c when the current audio file changes. It loops
* over all inactive grab clients and checks each grab client's configuration
* to determine if the client in question wishes to grab the new stream. If
* This function also garbage collects all grab clients whose tasks have been
* unscheduled.
*/
-void activate_grab_clients(void)
+void activate_grab_clients(struct sched *s)
{
struct grab_client *gc, *tmp;
free(gc);
continue;
}
- gc_activate(gc);
+ gc_activate(gc, s);
}
}
static int gc_close(struct grab_client *gc, int err)
{
- btr_remove_node(gc->btrn);
- btr_free_node(gc->btrn);
- gc->btrn = NULL;
+ btr_remove_node(&gc->btrn);
PARA_INFO_LOG("closing gc: %s\n", para_strerror(-err));
list_move(&gc->node, &inactive_grab_client_list);
if (err == -E_GC_WRITE || (gc->flags & GF_ONE_SHOT)) {
* \param fd The file descriptor of the client.
* \param argc Argument count.
* \param argv Argument vector.
+ * \param s The scheduler to register the grab client task to.
*
* 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
*
* \return Standard.
*/
-int grab_client_new(int fd, int argc, char **argv)
+int grab_client_new(int fd, int argc, char **argv, struct sched *s)
{
int ret;
struct grab_client *gc = para_calloc(sizeof(struct grab_client));
goto err_out;
gc->fd = fd;
para_list_add(&gc->node, &inactive_grab_client_list);
- gc_activate(gc);
+ gc_activate(gc, s);
return 1;
err_out:
free(gc);