brasero r937 - in trunk: . src/plugins/cdrkit src/plugins/cdrtools

[philippr svn gnome org]

Author: philippr
Date: Tue Jul  1 07:17:20 2008
New Revision: 937
URL: http://svn.gnome.org/viewvc/brasero?rev=937&view=rev

Log:
	Another fix for #527383 â Disc Copy (Create 1:1 copy of CD) doesn\'t work at all

	* src/plugins/cdrkit/burn-readom.c (brasero_readom_set_argv):
	* src/plugins/cdrtools/burn-readcd.c (brasero_readcd_set_argv):

Modified:
   trunk/ChangeLog
   trunk/src/plugins/cdrkit/burn-readom.c
   trunk/src/plugins/cdrtools/burn-readcd.c

Modified: trunk/src/plugins/cdrkit/burn-readom.c
==============================================================================
--- trunk/src/plugins/cdrkit/burn-readom.c	(original)
+++ trunk/src/plugins/cdrkit/burn-readom.c	Tue Jul  1 07:17:20 2008
@@ -279,8 +279,14 @@
 		 * because it is raw96 (2352+96) otherwise it is 2048  */
 		g_ptr_array_add (argv, g_strdup ("-clone"));
 	}
-	else if (output.subtype.img_format == BRASERO_IMAGE_FORMAT_BIN)
+	else if (output.subtype.img_format == BRASERO_IMAGE_FORMAT_BIN) {
 		g_ptr_array_add (argv, g_strdup ("-noerror"));
+
+		/* don't do it for clone since we need the entire disc */
+		result = brasero_readom_argv_set_iso_boundary (readom, argv, error);
+		if (result != BRASERO_BURN_OK)
+			return result;
+	}
 	else
 		BRASERO_JOB_NOT_SUPPORTED (readom);
 
@@ -291,10 +297,6 @@
 		&&  output.subtype.img_format != BRASERO_IMAGE_FORMAT_BIN)
 			BRASERO_JOB_NOT_SUPPORTED (readom);
 
-		result = brasero_readom_argv_set_iso_boundary (readom, argv, error);
-		if (result != BRASERO_BURN_OK)
-			return result;
-
 		result = brasero_job_get_image_output (BRASERO_JOB (readom),
 						       &image,
 						       NULL);
@@ -306,10 +308,6 @@
 		g_free (image);
 	}
 	else if (output.subtype.img_format == BRASERO_IMAGE_FORMAT_BIN) {
-		result = brasero_readom_argv_set_iso_boundary (readom, argv, error);
-		if (result != BRASERO_BURN_OK)
-			return result;
-
 		outfile_arg = g_strdup ("-f=-");
 		g_ptr_array_add (argv, outfile_arg);
 	}

Modified: trunk/src/plugins/cdrtools/burn-readcd.c
==============================================================================
--- trunk/src/plugins/cdrtools/burn-readcd.c	(original)
+++ trunk/src/plugins/cdrtools/burn-readcd.c	Tue Jul  1 07:17:20 2008
@@ -289,8 +289,14 @@
 		 * because it is raw96 (2352+96) otherwise it is 2048  */
 		g_ptr_array_add (argv, g_strdup ("-clone"));
 	}
-	else if (output.subtype.img_format == BRASERO_IMAGE_FORMAT_BIN)
+	else if (output.subtype.img_format == BRASERO_IMAGE_FORMAT_BIN) {
 		g_ptr_array_add (argv, g_strdup ("-noerror"));
+
+		/* don't do it for clone since we need the entire disc */
+		result = brasero_readcd_argv_set_iso_boundary (readcd, argv, error);
+		if (result != BRASERO_BURN_OK)
+			return result;
+	}
 	else
 		BRASERO_JOB_NOT_SUPPORTED (readcd);
 
@@ -301,10 +307,6 @@
 		&&  output.subtype.img_format != BRASERO_IMAGE_FORMAT_BIN)
 			BRASERO_JOB_NOT_SUPPORTED (readcd);
 
-		result = brasero_readcd_argv_set_iso_boundary (readcd, argv, error);
-		if (result != BRASERO_BURN_OK)
-			return result;
-
 		result = brasero_job_get_image_output (BRASERO_JOB (readcd),
 						       &image,
 						       NULL);
@@ -316,10 +318,6 @@
 		g_free (image);
 	}
 	else if (output.subtype.img_format == BRASERO_IMAGE_FORMAT_BIN) {
-		result = brasero_readcd_argv_set_iso_boundary (readcd, argv, error);
-		if (result != BRASERO_BURN_OK)
-			return result;
-
 		outfile_arg = g_strdup ("-f=-");
 		g_ptr_array_add (argv, outfile_arg);
 	}