Major audio format handler cleanups.

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 6d7cce5efdf109f251dfa112fb5ed6593d2c0d02..eb3b200ae6e5969be231c8be3e169d52e4430873 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -49,8 +49,8 @@ struct audio_format_info {
        void **filter_conf;
        /** the number of filters that should be activated for this audio format */
        unsigned int num_writers;
-       /** pointer to the array of writers to be activated */
-       struct writer **writers;
+       /** Array of writer numbers to be activated. */
+       int *writer_nums;
        /** pointer to the array of writer configurations */
        void **writer_conf;
        /** do not start receiver/filters/writer before this time */
@@ -382,7 +382,7 @@ static void open_filters(int slot_num)
        PARA_INFO_LOG("opening %s filters\n", audio_formats[s->format]);
        s->fc = para_calloc(sizeof(struct filter_chain));
        s->fc->filter_nodes = para_malloc(nf * sizeof(struct filter_node));
-       s->fc->inbuf = s->receiver_node->buf;
+       s->fc->inbufp = &s->receiver_node->buf;
        s->fc->in_loaded = &s->receiver_node->loaded;
        s->fc->input_error = &s->receiver_node->task.error;
        s->fc->task.pre_select = filter_pre_select;
@@ -402,7 +402,7 @@ static void open_filters(int slot_num)
                f->open(fn);
                PARA_NOTICE_LOG("%s filter %d/%d (%s) started in slot %d\n",
                        audio_formats[s->format], i,  nf, f->name, slot_num);
-               s->fc->outbuf = fn->buf;
+               s->fc->outbufp = &fn->buf;
                s->fc->out_loaded = &fn->loaded;
        }
        register_task(&s->fc->task);
@@ -420,7 +420,7 @@ static void open_writers(int slot_num)
        else
                s->wng = wng_new(a->num_writers);
        if (s->fc) {
-               s->wng->buf = s->fc->outbuf;
+               s->wng->bufp = s->fc->outbufp;
                s->wng->loaded = s->fc->out_loaded;
                s->wng->input_error = &s->fc->task.error;
                s->wng->channels = &s->fc->channels;
@@ -428,19 +428,17 @@ static void open_writers(int slot_num)
                s->fc->output_error = &s->wng->task.error;
                PARA_INFO_LOG("samplerate: %d\n", *s->wng->samplerate);
        } else {
-               s->wng->buf = s->receiver_node->buf;
+               s->wng->bufp = &s->receiver_node->buf;
                s->wng->loaded = &s->receiver_node->loaded;
                s->wng->input_error = &s->receiver_node->task.error;
        }
        for (i = 0; i < a->num_writers; i++) {
                s->wng->writer_nodes[i].conf = a->writer_conf[i];
-               s->wng->writer_nodes[i].writer = a->writers[i];
+               s->wng->writer_nodes[i].writer_num = a->writer_nums[i];
        }
        ret = wng_open(s->wng);
-       if (ret < 0) {
-               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+       if (ret < 0)
                return;
-       }
        s->wstime = *now;
        s->server_stream_start = stat_task->server_stream_start.tv_sec?
                stat_task->server_stream_start : *now;
@@ -691,7 +689,7 @@ static int parse_writer_args(void)
        FOR_EACH_AUDIO_FORMAT(i) {
                a = &afi[i];
                a->writer_conf = para_malloc(nw * sizeof(void *));
-               a->writers = para_malloc(nw * sizeof(struct writer *));
+               a->writer_nums = para_malloc(nw * sizeof(int));
                a->num_writers = 0;
        }
        for (i = 0; i < conf.writer_given; i++) {
@@ -707,7 +705,7 @@ static int parse_writer_args(void)
                        ret = writer_num;
                        goto out;
                }
-               a->writers[nw] = &writers[writer_num];
+               a->writer_nums[nw] = writer_num;
                a->writer_conf[nw] = wconf;
                PARA_INFO_LOG("%s writer #%d: %s\n", audio_formats[ret],
                        nw, writer_names[writer_num]);