X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=write_common.c;h=0c028aaa1001c2c3195fce24c408adf6db68ac45;hp=ac92bc1a1740d1eeefa50551d03744a6018fce41;hb=74cfed2536a16ca85bc0ce97f6bf307c96ae0d3d;hpb=c79899fe6a1e8eb3086749f46c599d9790d99921

diff --git a/write_common.c b/write_common.c
index ac92bc1a..0c028aaa 100644
--- a/write_common.c
+++ b/write_common.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file write_common.c common functions of para_audiod and para_write */
@@ -111,6 +99,7 @@ int wng_open(struct writer_node_group *g)
 	g->eof = 0;
 	return 1;
 err_out:
+	PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
 	unregister_task(&g->task);
 	while (i > 0) {
 		struct writer_node *wn = &g->writer_nodes[--i];
@@ -236,15 +225,9 @@ void *check_writer_arg(const char *wa, int *writer_num)
 struct writer_node_group *setup_default_wng(void)
 {
 	struct writer_node_group *wng = wng_new(1);
-	enum writer_enum default_writer;
-
-	if (NUM_SUPPORTED_WRITERS == 1)
-		default_writer = FILE_WRITE;
-	else
-		default_writer = 1;
-	wng->writer_nodes[0].writer = &writers[default_writer];
+	wng->writer_nodes[0].writer = &writers[DEFAULT_WRITER];
 	PARA_INFO_LOG("using default writer: %s %p\n",
-		writer_names[default_writer], writers[default_writer].parse_config);
-	wng->writer_nodes[0].conf = writers[default_writer].parse_config("");
+		writer_names[DEFAULT_WRITER], writers[DEFAULT_WRITER].parse_config);
+	wng->writer_nodes[0].conf = writers[DEFAULT_WRITER].parse_config("");
 	return wng;
 }