[Debburn-changes] r471 - cdrkit/trunk/wodim

[Eduard Bloch]

Author: blade
Date: 2006-11-25 13:16:35 +0100 (Sat, 25 Nov 2006)
New Revision: 471

Modified:
   cdrkit/trunk/wodim/cue.c
   cdrkit/trunk/wodim/defaults.h
   cdrkit/trunk/wodim/drv_jvc.c
   cdrkit/trunk/wodim/wodim.c
Log:
more cdrecord debranding, and nuked contents of defaults.h, rewritten with my defaults parser already

Modified: cdrkit/trunk/wodim/cue.c
===================================================================
--- cdrkit/trunk/wodim/cue.c	2006-11-25 12:13:05 UTC (rev 470)
+++ cdrkit/trunk/wodim/cue.c	2006-11-25 12:16:35 UTC (rev 471)
@@ -430,7 +430,7 @@
 		trackp[0].flags |= TI_TEXT;
 	} else {
 		errmsgno(EX_BAD, "Ignoring CDTEXTFILE '%s'.\n", word);
-		errmsgno(EX_BAD, "If you like to write CD-Text, call cdrecord -text.\n");
+		errmsgno(EX_BAD, "If you like to write CD-Text, call wodim -text.\n");
 	}
 
 	checkextra();

Modified: cdrkit/trunk/wodim/defaults.h
===================================================================
--- cdrkit/trunk/wodim/defaults.h	2006-11-25 12:13:05 UTC (rev 470)
+++ cdrkit/trunk/wodim/defaults.h	2006-11-25 12:16:35 UTC (rev 471)
@@ -1,41 +0,0 @@
-/*
- * This file has been modified for the cdrkit suite.
- *
- * The behaviour and appearence of the program code below can differ to a major
- * extent from the version distributed by the original author(s).
- *
- * For details, see Changelog file distributed with the cdrkit package. If you
- * received this file from another source then ask the distributing person for
- * a log of modifications.
- *
- */
-
-/* @(#)defaults.h	1.1 04/02/22 Copyright 1998-2004 J. Schilling */
-/*
- *	The cdrecord defaults (/etc/wodim.conf) interface
- *
- *	Copyright (c) 1998-2004 J. Schilling
- */
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * 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; see the file COPYING.  If not, write to the Free Software
- * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef	_DEFAULTS_H
-#define	_DEFAULTS_H
-/*
- * defaults.c
- */
-//extern	void	cdr_defaults	__PR((char **devp, int *speedp, long *fsp, char **drvoptp));
-
-#endif	/* _DEFAULTS_H */

Modified: cdrkit/trunk/wodim/drv_jvc.c
===================================================================
--- cdrkit/trunk/wodim/drv_jvc.c	2006-11-25 12:13:05 UTC (rev 470)
+++ cdrkit/trunk/wodim/drv_jvc.c	2006-11-25 12:16:35 UTC (rev 471)
@@ -712,7 +712,7 @@
 
 	if (trackp->tracks < 1) {
 		/*
-		 * We come here if cdrecord isonly called with the -fix option.
+		 * We come here if wodim isonly called with the -fix option.
 		 * As long as we cannot read and interpret the PMA, we must
 		 * abort here.
 		 */

Modified: cdrkit/trunk/wodim/wodim.c
===================================================================
--- cdrkit/trunk/wodim/wodim.c	2006-11-25 12:13:05 UTC (rev 470)
+++ cdrkit/trunk/wodim/wodim.c	2006-11-25 12:16:35 UTC (rev 471)
@@ -624,12 +624,6 @@
 		if (is_dvdwr && !set_cdrcmds("mmc_mdvd", (cdr_t **)NULL)) {
 			errmsgno(EX_BAD,
 			"Internal error, DVD driver failure. Please report to debburn-devel at lists.alioth.debian.org.\n");
-       /*
-			errmsgno(EX_BAD,
-			"This version of cdrecord does not include DVD-R/DVD-RW support code.\n");
-			errmsgno(EX_BAD,
- 			"See /usr/share/doc/cdrecord/README.DVD.Debian for details on DVD support.\n");
-      */
 		}
 		/*
 		 * Only exit if this is not the ProDVD test binary.
@@ -829,7 +823,7 @@
 		/*
 		 * Some drives (e.g. Plextor) don't like to write correctly
 		 * in SAO mode if the sector size is set to 512 bytes.
-		 * In addition, cdrecord -msinfo will not work properly
+		 * In addition, wodim -msinfo will not work properly
 		 * if the sector size is not 2048 bytes.
 		 */
 		set_secsize(usalp, DATA_SEC_SIZE);