From: Andre <maan@p133.(none)>
Date: Sun, 28 May 2006 23:19:20 +0000 (+0200)
Subject: audiod: fix nasty thinko
X-Git-Tag: v0.2.14~101^2~5
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=3f165887f575829f90ca6c2aedd8d1d6063a94e7;p=paraslash.git

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 d7884133..c2abfd5a 100644
--- 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];
-		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;
@@ -1016,7 +1016,7 @@ static int init_writers(void)
 			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]);