X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=1da78b5137fda429c80490abc77e548a1a3f812b;hp=8fb6c3d10797c4fc7ea4119de5c990271f177482;hb=a4f75cecaaee538edb7aae3f0ff19168a1dab59d;hpb=00e4d4da1b2c00da139b09d3ed4ab9ad9fba2691 diff --git a/write_common.c b/write_common.c index 8fb6c3d1..1da78b51 100644 --- a/write_common.c +++ b/write_common.c @@ -1,16 +1,20 @@ /* - * Copyright (C) 2006-2009 Andre Noll + * Copyright (C) 2006-2010 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file write_common.c common functions of para_audiod and para_write */ +#include +#include + #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" @@ -20,133 +24,10 @@ const char *writer_names[] ={WRITER_NAMES}; /** 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) -{ - 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]; - t->error = wn->writer->pre_select(s, wn); - if (t->error < 0) - return; - } -} - -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; - - FOR_EACH_WRITER_NODE(i, g) { - struct writer_node *wn = &g->writer_nodes[i]; - t->error = wn->writer->post_select(s, wn); - if (t->error < 0) - return; - if (!i) - min_written = wn->written; - else - min_written = PARA_MIN(min_written, wn->written); - } - //PARA_INFO_LOG("loaded: %zd, min_written: %zd bytes\n", *g->loaded, min_written); - if (min_written) { - *g->loaded -= min_written; - FOR_EACH_WRITER_NODE(i, g) - g->writer_nodes[i].written -= min_written; - } - if (!*g->loaded && *g->input_error) { - t->error = *g->input_error; - return; - } - if (*g->loaded && min_written) { -// PARA_INFO_LOG("moving %zd bytes\n", *g->loaded); - memmove(g->buf, g->buf + min_written, *g->loaded); - } -} - -/** - * call the open function of each writer in the group - * - * \param g the writer node group - * - * \return If at least one open function returned an error, all successful - * writer notes get closed and this error value is returned. Upon success, a - * task associated with \a g is registered to the scheduler and the function - * returns a positive value. - * */ -int wng_open(struct writer_node_group *g) -{ - int i, ret = 1; - - 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]; - wn->wng = g; - ret = wn->writer->open(wn); - if (ret < 0) - goto err_out; - wn->chunk_bytes = ret; - g->max_chunk_bytes = PARA_MAX(g->max_chunk_bytes, ret); - } - sprintf(g->task.status, "%s", "writer node group"); - register_task(&g->task); - g->open = 1; - return 1; -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); - } - g->num_writers = 0; - return ret; -} - -/** - * call the close function of each writer in the given group - * - * \param g the writer node group to close - * - * This function also frees all resources of the given group. - */ -void wng_close(struct writer_node_group *g) -{ - int i; - - if (!g || !g->open) - return; - 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); - } - free(g->writer_nodes); - free(g); -} - /** - * allocate and initialize a new writer_node_group struct - * - * \param num_writers the number of writer nodes for the new group - * - * \return Pointer to the new writer node group + * Call the init function of each supported paraslash writer. */ -struct writer_node_group *wng_new(unsigned num_writers) -{ - struct writer_node_group *g = para_calloc(sizeof(struct writer_node_group)); - g->num_writers = num_writers; - g->writer_nodes = para_calloc(num_writers - * sizeof(struct writer_node)); - g->task.post_select = wng_post_select; - g->task.pre_select = wng_pre_select; - return g; -} - -/** - * call the init function of each supported paraslash writer - */ -void init_supported_writers(void) +void writer_init(void) { int i; @@ -194,24 +75,60 @@ void *check_writer_arg(const char *wa, int *writer_num) return NULL; } +void register_writer_node(struct writer_node *wn, struct btr_node *parent) +{ + struct writer *w = writers + wn->writer_num; + char *name = make_message("%s writer", writer_names[wn->writer_num]); + int ret; + + wn->btrn = btr_new_node(&(struct btr_node_description) + EMBRACE(.name = name, .parent = parent, + .handler = w->execute, .context = wn)); + strcpy(wn->task.status, name); + free(name); + ret = w->open(wn); + wn->task.post_select = w->post_select; + wn->task.pre_select = w->pre_select; + register_task(&wn->task); +} + /** - * setup a writer node group with only one writer, the default writer + * 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. * - * The writer which is set up depends on the OS. It defaults to alsa for Linux, - * osx_write for OS X, file writer if neither of these is supported. + * Finally, the new writer node's taks structure is initialized and registered + * to the paraslash scheduler. * - * \return pointer to the allocated writer node group + * \return A pointer to the allocated writer node group. */ -struct writer_node_group *setup_default_wng(void) +int setup_writer_node(const char *arg, struct btr_node *parent, + struct writer_node *wn) { - struct writer_node_group *wng = wng_new(1); - wng->writer_nodes[0].writer = &writers[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; + 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) + return -E_WRITE_COMMON_SYNTAX; + register_writer_node(wn, parent); + return 1; } + +/** + * Print the help text of all writers to stdout. + * + * \param detailed Whether to print the detailed help text. + */ void print_writer_helps(int detailed) { int i; @@ -229,3 +146,31 @@ void print_writer_helps(int detailed) ggo_print_help(&w->help, detailed); } } + +static int get_btr_value(struct btr_node *btrn, const char *key, int32_t *result) +{ + char *buf = NULL; + int ret = btr_exec_up(btrn, key, &buf); + + if (ret < 0) + return ret; + ret = para_atoi32(buf, result); + free(buf); + return ret; +} + +/* + * Ask parent btr nodes for the samplerate of the current stream. + */ +int get_btr_samplerate(struct btr_node *btrn, int32_t *result) +{ + return get_btr_value(btrn, "samplerate", result); +} + +/* + * Ask parent btr nodes for the channel count of the current stream. + */ +int get_btr_channels(struct btr_node *btrn, int32_t *result) +{ + return get_btr_value(btrn, "channels", result); +}