brasero r1210 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Fri Aug 29 13:17:35 2008
New Revision: 1210
URL: http://svn.gnome.org/viewvc/brasero?rev=1210&view=rev

Log:
	Improved debugging to catch some bug

	* src/burn-medium.c (brasero_medium_track_volume_size),
	(brasero_medium_get_sessions_info):
	* src/burn-volume.c (brasero_volume_get_primary_from_file),
	(brasero_volume_get_size):


Modified:
   trunk/ChangeLog
   trunk/src/burn-medium.c
   trunk/src/burn-volume.c

Modified: trunk/src/burn-medium.c
==============================================================================
--- trunk/src/burn-medium.c	(original)
+++ trunk/src/burn-medium.c	Fri Aug 29 13:17:35 2008
@@ -929,6 +929,7 @@
 
 		if (error)
 			g_error_free (error);
+
 		return BRASERO_BURN_ERR;
 	}
 
@@ -1334,8 +1335,9 @@
 			 * which have only one track: the first. Since it's not
 			 * possible to know the amount of data that were really
 			 * written in this session, read the filesystem. */
-			BRASERO_BURN_LOG ("DVD+RW (DL) or DVD-RW (restricted overwrite) checking volume size");
+			BRASERO_BURN_LOG ("DVD+RW (DL) or DVD-RW (restricted overwrite) checking volume size (start = %i)", track->start);
 			track->session = 1;
+			track->start = 0;
 			result = brasero_medium_track_volume_size (self, 
 								   track,
 								   handle);

Modified: trunk/src/burn-volume.c
==============================================================================
--- trunk/src/burn-volume.c	(original)
+++ trunk/src/burn-volume.c	Fri Aug 29 13:17:35 2008
@@ -119,6 +119,7 @@
 			     BRASERO_BURN_ERROR,
 			     BRASERO_BURN_ERROR_GENERAL,
 			     _("there isn't a valid volume descriptor"));
+		BRASERO_BURN_LOG ("Wrong volume descriptor, got %.5s", desc->id);
 		return FALSE;
 	}
 
@@ -126,14 +127,6 @@
 }
 
 gboolean
-brasero_volume_is_valid_fd (BraseroVolSrc *vol, GError **error)
-{
-	gchar buffer [ISO9660_BLOCK_SIZE];
-
-	return brasero_volume_get_primary_from_file (vol, buffer, error);
-}
-
-gboolean
 brasero_volume_get_size (BraseroVolSrc *vol,
 			 gint64 block,
 			 gint64 *nb_blocks,
@@ -142,7 +135,7 @@
 	gboolean result;
 	gchar buffer [ISO9660_BLOCK_SIZE];
 
-	if (BRASERO_VOL_SRC_SEEK (vol, block, SEEK_SET, error) == -1)
+	if (block && BRASERO_VOL_SRC_SEEK (vol, block, SEEK_SET, error) == -1)
 		return FALSE;
 
 	result = brasero_volume_get_primary_from_file (vol, buffer, error);