Introduce btr_node_status() and add btr support to the file writer.

[paraslash.git] / alsa_write.c

diff --git a/alsa_write.c b/alsa_write.c
index 8b56f31a4e9c71443205f7c681a5ba0c2799f031..67c845d3957c6cde30929b2b045569097a38941d 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -173,10 +173,10 @@ static int alsa_write_pre_select(struct sched *s, struct writer_node *wn)
        if (!pad->handle)
                return 1;
        if (wn->btrn) {
-               size_t sz = btr_get_input_queue_size(wn->btrn);
-               if (sz < pad->bytes_per_frame) {
-                       if (!btr_no_parent(wn->btrn))
-                               return 1;
+               int ret = btr_node_status(wn->btrn, wn->min_iqs);
+               if (ret == 0)
+                       return 1;
+               if (ret < 0) {
                        underrun = 10;
                        goto timeout;
                }
@@ -213,7 +213,7 @@ timeout:
 static void alsa_write_pre_select_btr(struct sched *s, struct task *t)
 {
        struct writer_node *wn = container_of(t, struct writer_node, task);
-       t->error = alsa_write_pre_select(s, wn);
+       alsa_write_pre_select(s, wn);
 }
 
 static void xrun(snd_pcm_t *handle)
@@ -291,6 +291,7 @@ static void alsa_close(struct writer_node *wn)
                snd_pcm_close(pad->handle);
                snd_config_update_free_global();
        }
+       alsa_cmdline_parser_free(wn->conf);
        free(pad);
 }
 
@@ -307,9 +308,10 @@ static void alsa_write_post_select_btr(__a_unused struct sched *s,
 
 again:
        t->error = 0;
-       ret = prepare_writer_node(wn);
+       ret = btr_node_status(btrn, wn->min_iqs);
        if (ret == 0)
                return;
+       btr_merge(btrn, wn->min_iqs);
        bytes = btr_next_buffer(btrn, &data);
        if (bytes < pad->bytes_per_frame) { /* eof */
                assert(btr_no_parent(btrn));
@@ -388,8 +390,6 @@ again:
        ret = -E_ALSA_WRITE;
 err:
        assert(ret < 0);
-       btr_del_node(btrn);
-       alsa_close(wn);
        t->error = ret;
 }