X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=4fc04b5120829d057617d68d7854453c2612c6cc;hb=d5dc1cb250dfb44d25293e1a01b4c2583df2352a;hp=9f2aa5ab6960f08c9affdd919ae04b26f73b039c;hpb=4ac3134c050ba28b57e0ae9686eb1f6d83e6d586;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index 9f2aa5ab..4fc04b51 100644
--- a/audiod.c
+++ b/audiod.c
@@ -806,17 +806,19 @@ static int parse_writer_args(void)
 	}
 	/* Use default writer for audio formats which are not yet set up. */
 	FOR_EACH_AUDIO_FORMAT(i) {
-		struct writer *w = writers + DEFAULT_WRITER;
+		void *writer_conf;
+		int writer_num;
 		a = afi + i;
 		if (a->num_writers > 0)
 			continue; /* already set up */
-		PARA_INFO_LOG("%s writer: %s (default)\n", audio_formats[i],
-			writer_names[DEFAULT_WRITER]);
+		writer_conf = check_writer_arg_or_die(NULL, &writer_num);
 		a->writer_nums = para_malloc(sizeof(int));
-		a->writer_nums[0] = DEFAULT_WRITER;
+		a->writer_nums[0] = writer_num;
 		a->writer_conf = para_malloc(sizeof(void *));
-		a->writer_conf[0] = w->parse_config_or_die("");
+		a->writer_conf[0] = writer_conf;
 		a->num_writers = 1;
+		PARA_INFO_LOG("%s writer: %s (default)\n", audio_formats[i],
+			writer_names[writer_num]);
 	}
 	return 1;
 }