brasero r1587 - in trunk: . src/plugins/cdrkit src/plugins/cdrtools src/plugins/dvdcss src/plugins/libburnia

[philippr svn gnome org]

Author: philippr
Date: Sun Nov 30 17:27:14 2008
New Revision: 1587
URL: http://svn.gnome.org/viewvc/brasero?rev=1587&view=rev

Log:
	Fix #561683 â No status whilst copying data DVD to DVD/ISO after 2048MB copied.
	Fix an overflow when we declared the size copied using 2048 instead of 2048ULL

	* src/plugins/cdrkit/burn-readom.c (brasero_readom_read_stderr):
	* src/plugins/cdrtools/burn-readcd.c (brasero_readcd_read_stderr):
	* src/plugins/dvdcss/burn-dvdcss.c
	(brasero_dvdcss_write_image_thread):
	* src/plugins/libburnia/burn-libburn-common.c
	(brasero_libburn_common_status):
	* src/plugins/libburnia/burn-libburn.c:


Modified:
   trunk/ChangeLog
   trunk/src/plugins/cdrkit/burn-readom.c
   trunk/src/plugins/cdrtools/burn-readcd.c
   trunk/src/plugins/dvdcss/burn-dvdcss.c
   trunk/src/plugins/libburnia/burn-libburn-common.c
   trunk/src/plugins/libburnia/burn-libburn.c

Modified: trunk/src/plugins/cdrkit/burn-readom.c
==============================================================================
--- trunk/src/plugins/cdrkit/burn-readom.c	(original)
+++ trunk/src/plugins/cdrkit/burn-readom.c	Sun Nov 30 17:27:14 2008
@@ -68,11 +68,11 @@
 
 		brasero_job_get_output_type (BRASERO_JOB (readom), &output);
 		if (output.subtype.img_format == BRASERO_IMAGE_FORMAT_BIN)
-			written = sector * 2048;
+			written = (gint64) ((gint64) sector * 2048ULL);
 		else if (output.subtype.img_format == BRASERO_IMAGE_FORMAT_CLONE)
-			written = sector * 2448;
+			written = (gint64) ((gint64) sector * 2448ULL);
 		else
-			written = sector * 2048;
+			written = (gint64) ((gint64) sector * 2048ULL);
 
 		brasero_job_set_written_track (BRASERO_JOB (readom), written);
 
@@ -111,7 +111,6 @@
 						_("An internal error occured")));
 	}
 
-
 	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	Sun Nov 30 17:27:14 2008
@@ -68,11 +68,11 @@
 
 		brasero_job_get_output_type (BRASERO_JOB (readcd), &output);
 		if (output.subtype.img_format == BRASERO_IMAGE_FORMAT_BIN)
-			written = sector * 2048;
+			written = (gint64) ((gint64) sector * 2048ULL);
 		else if (output.subtype.img_format == BRASERO_IMAGE_FORMAT_CLONE)
-			written = sector * 2448;
+			written = (gint64) ((gint64) sector * 2448ULL);
 		else
-			written = sector * 2048;
+			written = (gint64) ((gint64) sector * 2048ULL);
 
 		brasero_job_set_written_track (BRASERO_JOB (readcd), written);
 

Modified: trunk/src/plugins/dvdcss/burn-dvdcss.c
==============================================================================
--- trunk/src/plugins/dvdcss/burn-dvdcss.c	(original)
+++ trunk/src/plugins/dvdcss/burn-dvdcss.c	Sun Nov 30 17:27:14 2008
@@ -62,7 +62,7 @@
 
 #define BRASERO_DVDCSS_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE ((o), BRASERO_TYPE_DVDCSS, BraseroDvdcssPrivate))
 
-#define BRASERO_DVDCSS_I_BLOCKS	16
+#define BRASERO_DVDCSS_I_BLOCKS	16ULL
 
 static GObjectClass *parent_class = NULL;
 
@@ -400,7 +400,8 @@
 	}
 
 	while (remaining_sectors) {
-		gint flag, num_blocks, data_size;
+		gint flag;
+		guint64 num_blocks, data_size;
 
 		if (priv->cancel)
 			break;
@@ -472,7 +473,6 @@
 			result = brasero_dvdcss_write_sector_to_fd (self,
 								    buf,
 								    data_size);
-
 			if (result != BRASERO_BURN_OK)
 				break;
 		}

Modified: trunk/src/plugins/libburnia/burn-libburn-common.c
==============================================================================
--- trunk/src/plugins/libburnia/burn-libburn-common.c	(original)
+++ trunk/src/plugins/libburnia/burn-libburn-common.c	Sun Nov 30 17:27:14 2008
@@ -360,7 +360,7 @@
 		}
 
 		cur_sector = progress.sector + ctx->sectors;
-		brasero_job_set_written_session (self, cur_sector * 2048);
+		brasero_job_set_written_session (self, (gint64) ((gint64) cur_sector * 2048ULL));
 	}
 	else {
 		gdouble fraction;

Modified: trunk/src/plugins/libburnia/burn-libburn.c
==============================================================================
--- trunk/src/plugins/libburnia/burn-libburn.c	(original)
+++ trunk/src/plugins/libburnia/burn-libburn.c	Sun Nov 30 17:27:14 2008
@@ -53,7 +53,7 @@
 
 BRASERO_PLUGIN_BOILERPLATE (BraseroLibburn, brasero_libburn, BRASERO_TYPE_JOB, BraseroJob);
 
-#define BRASERO_PVD_SIZE	32L * 2048L
+#define BRASERO_PVD_SIZE	32ULL * 2048ULL
 
 struct _BraseroLibburnPrivate {
 	BraseroLibburnCtx *ctx;