[Debburn-changes] r675 - in cdrkit/trunk: . wodim

[Eduard Bloch]

Author: blade
Date: 2007-01-05 20:09:03 +0100 (Fri, 05 Jan 2007)
New Revision: 675

Modified:
   cdrkit/trunk/Changelog
   cdrkit/trunk/wodim/drv_mmc.c
   cdrkit/trunk/wodim/wodim.c
Log:
Don't be confused if burnfree driveropts are specified

Modified: cdrkit/trunk/Changelog
===================================================================
--- cdrkit/trunk/Changelog	2007-01-03 19:03:55 UTC (rev 674)
+++ cdrkit/trunk/Changelog	2007-01-05 19:09:03 UTC (rev 675)
@@ -3,6 +3,10 @@
   [ Stefan Huehner ]
   * more Cstyle cleanups
 
+  [ Eduard Bloch ]
+  * stop confusion and bailing out if burnfree/burnproof options have been
+    explicitely specified
+
  -- Eduard Bloch <blade at debian.org>  Mon,  1 Jan 2007 17:15:16 +0100
 
 cdrkit (1.1.1) RELEASED; urgency=low

Modified: cdrkit/trunk/wodim/drv_mmc.c
===================================================================
--- cdrkit/trunk/wodim/drv_mmc.c	2007-01-03 19:03:55 UTC (rev 674)
+++ cdrkit/trunk/wodim/drv_mmc.c	2007-01-05 19:09:03 UTC (rev 675)
@@ -851,9 +851,9 @@
 
 	check_writemodes_mmc(usalp, dp);
 
-    /* Enable Burnfree by default, it can be disabled later */
-    if ((dp->cdr_flags & CDR_BURNFREE) != 0)
-        dp->cdr_dstat->ds_cdrflags |= RF_BURNFREE;
+	/* Enable Burnfree by default, it can be disabled later */
+	if ((dp->cdr_flags & CDR_BURNFREE) != 0)
+		dp->cdr_dstat->ds_cdrflags |= RF_BURNFREE;
 
 	if (driveropts != NULL) {
 		char	*p;
@@ -2495,25 +2495,33 @@
 	mp->multi_session = (track_base(trackp)->tracktype & TOCF_MULTI) ?
 				MS_MULTI : MS_NONE;
 	mp->session_format = toc2sess[track_base(trackp)->tracktype & TOC_MASK];
-	
-    /* Enable Burnfree by default, allow to disable. XXX Sucks, duplicated functionality. */
-    if (dp->cdr_cdcap->BUF != 0) {
-        if (lverbose > 2)
-            fprintf(stderr, 
-                    "BURN-Free is %s.\n"
-                    "Turning BURN-Free on\n",
-                    mp->BUFE?"ON":"OFF");
-        mp->BUFE = 1;
-    }
+
+	/* Enable Burnfree by default, allow to disable. XXX Sucks, duplicated functionality. */
+	if (dp->cdr_cdcap->BUF != 0) {
+		if (lverbose > 2)
+			fprintf(stderr, 
+					"BURN-Free is %s.\n"
+					"Turning BURN-Free on\n",
+					mp->BUFE?"ON":"OFF");
+		mp->BUFE = 1;
+	}
 	if (driveropts != NULL) {
-        if ((strcmp(driveropts, "noburnproof") == 0 ||
-                    strcmp(driveropts, "noburnfree") == 0)) {
+		if ((strcmp(driveropts, "noburnproof") == 0 ||
+					strcmp(driveropts, "noburnfree") == 0)) {
 			if(lverbose>1)
 				fprintf(stderr, "Turning BURN-Free off\n");
 			mp->BUFE = 0;
-		} else if (strcmp(driveropts, "help") == 0) {
+		}
+		else if ((strcmp(driveropts, "burnproof") == 0 ||
+					strcmp(driveropts, "burnfree") == 0)) {
+			/* a NOP, we enable burnfree by default */
+			if(lverbose>2)
+				fprintf(stderr, "Found burnproof/burnfree in driveropts, those options are enabled by default now.");
+		}
+		else if (strcmp(driveropts, "help") == 0) {
 			mmc_opthelp(dp, 0);
-		} else {
+		} 
+		else {
 			errmsgno(EX_BAD, "Bad driver opts '%s'.\n", driveropts);
 			mmc_opthelp(dp, EX_BAD);
 		}

Modified: cdrkit/trunk/wodim/wodim.c
===================================================================
--- cdrkit/trunk/wodim/wodim.c	2007-01-03 19:03:55 UTC (rev 674)
+++ cdrkit/trunk/wodim/wodim.c	2007-01-05 19:09:03 UTC (rev 675)
@@ -1457,7 +1457,7 @@
 	if (gracetime > 999)
 		gracetime = 999;
 
-   printf("Starting to write CD/DVD at speed %5.1f in %s%s %s mode for %s session.\n",
+	printf("Starting to write CD/DVD at speed %5.1f in %s%s %s mode for %s session.\n",
          (float)dp->cdr_dstat->ds_wspeed,
 		(dp->cdr_cmdflags & F_DUMMY) ? "dummy" : "real",
 		(dp->cdr_cmdflags & F_FORCE) ? " force" : "",