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

[philippr svn gnome org]

Author: philippr
Date: Thu Oct 30 09:38:41 2008
New Revision: 1444
URL: http://svn.gnome.org/viewvc/brasero?rev=1444&view=rev

Log:
	Fix for #558469 â Audio CD cloning fails but brasero reports success 
	readcd/readom fail but report success on reading. Do a workaround in the
	plugins

	* src/plugins/cdrkit/burn-readom.c (brasero_readom_read_stderr):
	* src/plugins/cdrtools/burn-readcd.c (brasero_readcd_read_stderr):


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	Thu Oct 30 09:38:41 2008
@@ -52,6 +52,8 @@
 brasero_readom_read_stderr (BraseroProcess *process, const gchar *line)
 {
 	BraseroReadom *readom;
+	gint dummy1;
+	gint dummy2;
 	gchar *pos;
 
 	readom = BRASERO_READOM (process);
@@ -109,6 +111,14 @@
 						BRASERO_BURN_ERROR_SCSI_IOCTL,
 						_("you don't seem to have the required permissions to access the drive")));
 	}
+	/* we scan for this error as in this case readcd returns success */
+	else if (sscanf (line, "Input/output error. Error on sector %d not corrected. Total of %d error", &dummy1, &dummy2) == 2) {
+		brasero_job_error (BRASERO_JOB (process),
+				   g_error_new (BRASERO_BURN_ERROR,
+						BRASERO_BURN_ERROR_GENERAL,
+						_("internal error")));
+	}
+
 
 	return BRASERO_BURN_OK;
 }

Modified: trunk/src/plugins/cdrtools/burn-readcd.c
==============================================================================
--- trunk/src/plugins/cdrtools/burn-readcd.c	(original)
+++ trunk/src/plugins/cdrtools/burn-readcd.c	Thu Oct 30 09:38:41 2008
@@ -52,6 +52,8 @@
 brasero_readcd_read_stderr (BraseroProcess *process, const gchar *line)
 {
 	BraseroReadcd *readcd;
+	gint dummy1;
+	gint dummy2;
 	gchar *pos;
 
 	readcd = BRASERO_READCD (process);
@@ -109,6 +111,13 @@
 						BRASERO_BURN_ERROR_SCSI_IOCTL,
 						_("you don't seem to have the required permissions to access the drive")));
 	}
+	/* we scan for this error as in this case readcd returns success */
+	else if (sscanf (line, "Input/output error. Error on sector %d not corrected. Total of %d error", &dummy1, &dummy2) == 2) {
+		brasero_job_error (BRASERO_JOB (process),
+				   g_error_new (BRASERO_BURN_ERROR,
+						BRASERO_BURN_ERROR_GENERAL,
+						_("internal error")));
+	}
 
 	return BRASERO_BURN_OK;
 }