audiod: fix nasty thinko

"ret" was used where "writer_num" is correct. This makes the "-w" option
of para_audiod work again. Fix another typo too.

diff --git a/audiod.c b/audiod.c
index d78841336893c170f9da7472c717b1e70c9c45bc..c2abfd5ab50a57abfb7d042c698b7eaca9efd546 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -693,7 +693,7 @@ static void open_writer(int slot_num)
        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];
        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];

-               sprintf(s->wng->writer_nodes[i].task.status, "writer_ node");
+               sprintf(s->wng->writer_nodes[i].task.status, "writer_node");

        }
        ret = wng_open(s->wng);
        s->wstime = *now;
        }
        ret = wng_open(s->wng);
        s->wstime = *now;


@@ -1016,7 +1016,7 @@ static int init_writers(void)
                        ret = writer_num;
                        goto out;
                }
                        ret = writer_num;
                        goto out;
                }

-               a->writers[nw] = &writers[ret];
+               a->writers[nw] = &writers[writer_num];

                a->writer_conf[nw] = wconf;
                PARA_INFO_LOG("%s writer #%d: %s\n", audio_formats[ret],
                        nw, writer_names[writer_num]);
                a->writer_conf[nw] = wconf;
                PARA_INFO_LOG("%s writer #%d: %s\n", audio_formats[ret],
                        nw, writer_names[writer_num]);