sched: Update "now" also after post_select.

[paraslash.git] / alsa_write.c

diff --git a/alsa_write.c b/alsa_write.c
index 67c845d3957c6cde30929b2b045569097a38941d..77621979783955dd09a48464cee6e9d7dceafbbb 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -152,7 +152,6 @@ static int alsa_open_btr(struct writer_node *wn)
 {
        struct private_alsa_write_data *pad = para_calloc(sizeof(*pad));
 
-       sprintf(wn->task.status, "alsa writer");
        wn->private_data = pad;
        return 1;
 }
@@ -173,7 +172,7 @@ static int alsa_write_pre_select(struct sched *s, struct writer_node *wn)
        if (!pad->handle)
                return 1;
        if (wn->btrn) {
-               int ret = btr_node_status(wn->btrn, wn->min_iqs);
+               int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
                if (ret == 0)
                        return 1;
                if (ret < 0) {
@@ -308,7 +307,7 @@ static void alsa_write_post_select_btr(__a_unused struct sched *s,
 
 again:
        t->error = 0;
-       ret = btr_node_status(btrn, wn->min_iqs);
+       ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
        if (ret == 0)
                return;
        btr_merge(btrn, wn->min_iqs);
@@ -325,7 +324,6 @@ again:
                return;
        }
        if (!pad->handle) {
-               char *buf;
                struct alsa_write_args_info *conf = wn->conf;
                if (bytes == 0) /* no data available */
                        return;
@@ -334,32 +332,18 @@ again:
                pad->samplerate = conf->samplerate_arg;
                pad->channels = conf->channels_arg;
                if (!conf->samplerate_given) { /* config option trumps btr_exec */
-                       /* ask parent btr nodes */
-                       buf = NULL;
-                       ret = btr_exec_up(btrn, "samplerate", &buf);
-                       PARA_CRIT_LOG("ret: %d\n", ret);
-                       if (ret >= 0) {
-                               int32_t rate;
-
-                               ret = para_atoi32(buf, &rate);
-                               free(buf);
-                               if (ret < 0) /* should not happen */
-                                       goto err;
-                               pad->samplerate = rate;
-                       }
+                       int32_t rate;
+                       ret = get_btr_samplerate(btrn, &rate);
+                       if (ret < 0)
+                               goto err;
+                       pad->samplerate = rate;
                }
                if (!conf->channels_given) {
-                       buf = NULL;
-                       ret = btr_exec_up(btrn, "channels", &buf);
-                       if (ret >= 0) {
-                               int32_t ch;
-
-                               ret = para_atoi32(buf, &ch);
-                               freep(&buf);
-                               if (ret < 0)
-                                       goto err;
-                               pad->channels = ch;
-                       }
+                       int32_t ch;
+                       ret = get_btr_channels(btrn, &ch);
+                       if (ret < 0)
+                               goto err;
+                       pad->channels = ch;
                }
                PARA_INFO_LOG("%d channel(s), %dHz\n", pad->channels, pad->samplerate);
                ret = 1;