X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=a1aac65e3ddab78e0516c515dd1a6e75c9793b79;hp=b92c5f1ca64f04328a482f9105d9280968e7877a;hb=9c00a79ed817c854ed10ee6bd1b908df8dc13a2f;hpb=5ec0d9ef2189e22b3ee80f661196b6ae0593a525 diff --git a/write_common.c b/write_common.c index b92c5f1c..a1aac65e 100644 --- a/write_common.c +++ b/write_common.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 Andre Noll + * Copyright (C) 2006-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -7,7 +7,6 @@ /** \file write_common.c common functions of para_audiod and para_write */ #include -#include #include "para.h" #include "string.h" @@ -35,10 +34,10 @@ void writer_init(void) writers[i].init(&writers[i]); } /** - * check if given string is a valid command line for any writer + * Check if given string is a valid command line for any writer. * - * \param \wa string of the form writer_name:options - * \param writer_num contains the number of the writer upon success + * \param \wa String of the form writer_name:options. + * \param writer_num Contains the number of the writer upon success. * * This function checks whether \a wa starts with the name of a supported * paraslash writer, optionally followed by a colon and any options for that @@ -47,83 +46,84 @@ void writer_init(void) * * \return On success, a pointer to the gengetopt args info struct is returned * and \a writer_num contains the number of the writer. Otherwise this function - * returns \p NULL. + * prints an error message and calls exit(). */ -void *check_writer_arg(const char *wa, int *writer_num) +void *check_writer_arg_or_die(const char *wa, int *writer_num) { - int i; - - *writer_num = -E_WRITE_COMMON_SYNTAX; - PARA_INFO_LOG("checking %s\n", wa); + int i, ret, argc; + const char *cmdline; + char **argv; + void *conf; + + if (!wa || !*wa) { + i = DEFAULT_WRITER; + cmdline = NULL; + goto check; + } + PARA_INFO_LOG("checking %s\n", wa); FOR_EACH_WRITER(i) { const char *name = writer_names[i]; size_t len = strlen(name); char c; + if (strlen(wa) < len) continue; if (strncmp(name, wa, len)) continue; c = wa[len]; - if (c && c != ' ') - continue; - if (c && !writers[i].parse_config) - return NULL; - *writer_num = i; - return writers[i].parse_config(c? wa + len + 1 : ""); + if (!c || c == ' ') { + cmdline = c? wa + len + 1 : NULL; + goto check; + } } - PARA_ERROR_LOG("writer not found\n"); - return NULL; + PARA_EMERG_LOG("invalid writer %s\n", wa); + exit(EXIT_FAILURE); +check: + ret = create_shifted_argv(cmdline, " \t", &argv); + if (ret < 0) { + PARA_EMERG_LOG("%s: %s\n", wa, para_strerror(-ret)); + exit(EXIT_FAILURE); + } + argc = ret; + argv[0] = make_message("%s_write", writer_names[i]); + *writer_num = i; + conf = writers[i].parse_config_or_die(argc, argv); + free_argv(argv); + return conf; } -void register_writer_node(struct writer_node *wn, struct btr_node *parent) +/** + * Open a writer node and register the corresponding task. + * + * \param wn The writer node to open. + * \param parent The parent btr node (the source for the writer node). + * \param s The scheduler instance to register the task to. + * + * The configuration of the writer node stored in \p wn->conf must be + * initialized before this function may be called. + */ +void register_writer_node(struct writer_node *wn, struct btr_node *parent, + struct sched *s) { 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 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. - */ -int setup_writer_node(const char *arg, struct btr_node *parent, - struct writer_node *wn) -{ - 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 (w->new_post_select) { + wn->task.new_post_select = w->new_post_select; + wn->task.post_select = NULL; + } else { + wn->task.new_post_select = NULL; + wn->task.post_select = w->post_select; } - if (!wn->conf) - return -E_WRITE_COMMON_SYNTAX; - register_writer_node(wn, parent); - return 1; + register_task(s, &wn->task); } - /** * Print the help text of all writers to stdout. * @@ -147,30 +147,57 @@ void print_writer_helps(int detailed) } } -static int get_btr_value(struct btr_node *btrn, const char *key, int32_t *result) +static void get_btr_value(struct btr_node *btrn, const char *cmd, + int32_t *result) { char *buf = NULL; - int ret = btr_exec_up(btrn, key, &buf); - - if (ret < 0) - return ret; + int ret = btr_exec_up(btrn, cmd, &buf); + + if (ret < 0) { + /* + * This really should not happen. It means one of our parent + * nodes died unexpectedly. Proceed with fingers crossed. + */ + PARA_CRIT_LOG("cmd %s: %s\n", cmd, para_strerror(-ret)); + *result = 0; + return; + } ret = para_atoi32(buf, result); + assert(ret >= 0); free(buf); - return ret; } -/* - * Ask parent btr nodes for the samplerate of the current stream. +/** + * Ask parent btr nodes for the sample rate of the current stream. + * + * \param btrn Where to start the search. + * \param result Filled in by this function. + * + * This function is assumed to succeed and terminates on errors. */ -int get_btr_samplerate(struct btr_node *btrn, int32_t *result) +void get_btr_sample_rate(struct btr_node *btrn, int32_t *result) { - return get_btr_value(btrn, "samplerate", result); + get_btr_value(btrn, "sample_rate", result); } -/* +/** * Ask parent btr nodes for the channel count of the current stream. + * + * \param btrn See \ref get_btr_sample_rate. + * \param result See \ref get_btr_sample_rate. + */ +void get_btr_channels(struct btr_node *btrn, int32_t *result) +{ + get_btr_value(btrn, "channels", result); +} + +/** + * Ask parent btr nodes for the number of bits per sample and the byte sex. + * + * \param btrn See \ref get_btr_sample_rate. + * \param result Contains the sample format as an enum sample_format type. */ -int get_btr_channels(struct btr_node *btrn, int32_t *result) +void get_btr_sample_format(struct btr_node *btrn, int32_t *result) { - return get_btr_value(btrn, "channels", result); + get_btr_value(btrn, "sample_format", result); }