/** \file write_common.c common functions of para_audiod and para_write */
+#include <regex.h>
+#include <stdbool.h>
+
#include "para.h"
#include "string.h"
#include "list.h"
#include "sched.h"
#include "ggo.h"
+#include "buffer_tree.h"
#include "write.h"
#include "error.h"
/** the array of supported writers */
struct writer writers[NUM_SUPPORTED_WRITERS] = {WRITER_ARRAY};
-static void wng_pre_select(__a_unused struct sched *s, struct task *t)
+static void wng_pre_select(struct sched *s, struct task *t)
{
struct writer_node_group *g = container_of(t, struct writer_node_group, task);
int i;
FOR_EACH_WRITER_NODE(i, g) {
struct writer_node *wn = &g->writer_nodes[i];
- if (!wn->writer->pre_select)
+ struct writer *w = writers + wn->writer_num;
+ if (!w->pre_select)
continue;
- t->error = wn->writer->pre_select(s, wn);
+ t->error = w->pre_select(s, wn);
if (t->error < 0)
return;
}
+ /*
+ * Force a minimal delay if something was written during the previous
+ * call to wng_post_select(). This is necessary because the filter
+ * chain might still have data for us which it couldn't convert during
+ * the previous run due to its buffer size constraints. In this case we
+ * do not want to wait until the next input data arrives as this could
+ * lead to buffer underruns.
+ */
+ if (g->last_written == 0)
+ return;
+ s->timeout.tv_sec = 0;
+ s->timeout.tv_usec = 1;
}
static void wng_post_select(struct sched *s, struct task *t)
{
struct writer_node_group *g = container_of(t, struct writer_node_group, task);
int i;
- size_t min_written = 0;
+ size_t min_written = 0, max_written = 0;
FOR_EACH_WRITER_NODE(i, g) {
struct writer_node *wn = &g->writer_nodes[i];
- t->error = wn->writer->post_select(s, wn);
+ struct writer *w = writers + wn->writer_num;
+ t->error = w->post_select(s, wn);
if (t->error < 0)
return;
if (!i)
min_written = wn->written;
else
min_written = PARA_MIN(min_written, wn->written);
+ max_written = PARA_MAX(max_written, wn->written);
}
+ g->last_written = max_written;
//PARA_INFO_LOG("loaded: %zd, min_written: %zd bytes\n", *g->loaded, min_written);
if (min_written) {
*g->loaded -= min_written;
PARA_NOTICE_LOG("opening wng %p with %d writer(s)\n", g, g->num_writers);
FOR_EACH_WRITER_NODE(i, g) {
struct writer_node *wn = &g->writer_nodes[i];
+ struct writer *w = writers + wn->writer_num;
wn->wng = g;
- ret = wn->writer->open(wn);
+ ret = w->open(wn);
if (ret < 0)
goto err_out;
}
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
while (i > 0) {
struct writer_node *wn = &g->writer_nodes[--i];
- wn->writer->close(wn);
+ struct writer *w = writers + wn->writer_num;
+ w->close(wn);
}
free(g->writer_nodes);
g->num_writers = 0;
PARA_NOTICE_LOG("closing wng with %d writer(s)\n", g->num_writers);
FOR_EACH_WRITER_NODE(i, g) {
struct writer_node *wn = &g->writer_nodes[i];
- wn->writer->close(wn);
+ struct writer *w = writers + wn->writer_num;
+ w->close(wn);
}
free(g->writer_nodes);
free(g);
struct writer_node_group *setup_default_wng(void)
{
struct writer_node_group *wng = wng_new(1);
- wng->writer_nodes[0].writer = &writers[DEFAULT_WRITER];
+ wng->writer_nodes[0].writer_num = DEFAULT_WRITER;
PARA_INFO_LOG("using default writer: %s %p\n",
writer_names[DEFAULT_WRITER], writers[DEFAULT_WRITER].parse_config);
wng->writer_nodes[0].conf = writers[DEFAULT_WRITER].parse_config("");
return wng;
}
+
+/**
+ * Setup a writer node with the default writer.
+ *
+ * If arg is \p NULL, the OS-dependent default writer is used with an empty
+ * configuration string. It defaults to alsa for Linux, osx for OS X, oss for
+ * *BSD and the file writer if neither of these is supported.
+ *
+ * Once the writer configuration has been retrieved, a writer node is created,
+ * its buffer tree node is added to the buffer tree as a child of the given
+ * parent.
+ *
+ * Finally, the new writer node's taks structure is initialized and registered
+ * to the paraslash scheduler.
+ *
+ * \return A pointer to the allocated writer node group.
+ */
+struct writer_node *setup_writer_node(const char *arg, struct btr_node *parent)
+{
+ struct writer_node *wn = para_calloc(sizeof(*wn));
+ struct writer *w;
+ const char *name;
+
+ if (arg)
+ wn->conf = check_writer_arg(arg, &wn->writer_num);
+ else {
+ wn->writer_num = DEFAULT_WRITER;
+ wn->conf = writers[DEFAULT_WRITER].parse_config("");
+ }
+ if (!wn->conf) {
+ free(wn);
+ return NULL;
+ }
+ w = writers + wn->writer_num;
+ name = writer_names[wn->writer_num];
+ wn->btrn = btr_new_node(name, parent, w->execute, wn);
+ sprintf(wn->task.status, "%s", name);
+ w->open(wn);
+ wn->task.post_select = w->post_select_btr;
+ wn->task.pre_select = w->pre_select_btr;
+ register_task(&wn->task);
+ return wn;
+}
+
+
/**
* Print the help text of all writers to stdout.
*
projects / paraslash.git / blobdiff