brasero r1788 - in trunk: . src/plugins/growisofs

[philippr svn gnome org]

Author: philippr
Date: Mon Jan 19 08:17:46 2009
New Revision: 1788
URL: http://svn.gnome.org/viewvc/brasero?rev=1788&view=rev

Log:
2009-01-19  Philippe Rouquier  <ykw localhost localdomain>

	Fixed a problem with infinite blanking when fast is selected
	Fix part of #568204 â Brasero can't erase DVD+RW and speed issue

	* src/plugins/growisofs/burn-growisofs.c
	(brasero_growisofs_read_stdout):

Modified:
   trunk/ChangeLog
   trunk/src/plugins/growisofs/burn-growisofs.c

Modified: trunk/src/plugins/growisofs/burn-growisofs.c
==============================================================================
--- trunk/src/plugins/growisofs/burn-growisofs.c	(original)
+++ trunk/src/plugins/growisofs/burn-growisofs.c	Mon Jan 19 08:17:46 2009
@@ -73,13 +73,14 @@
 	int speed_1, speed_2;
 	long long b_written, b_total;
 
-	if (sscanf (line, "%10lld/%lld (%2d.%1d%%) @%2d.%1dx, remaining %*d:%*d",
+	/* Newer growisofs version have a different line pattern that shows
+	 * drive buffer filling. */
+	if (sscanf (line, "%10lld/%lld (%4d.%1d%%) @%2d.%1dx, remaining %*d:%*d",
 		    &b_written, &b_total, &perc_1, &perc_2, &speed_1, &speed_2) == 6) {
 		BraseroJobAction action;
 
 		brasero_job_get_action (BRASERO_JOB (process), &action);
-		if (action == BRASERO_JOB_ACTION_ERASE
-		&&  b_written >= 65536) {
+		if (action == BRASERO_JOB_ACTION_ERASE && b_written >= 65536) {
 			/* we nullified 65536 that's enough. A signal SIGTERM
 			 * will be sent in process.c. That's not the best way
 			 * to do it but it works. */