brasero r1237 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Tue Sep  2 08:25:12 2008
New Revision: 1237
URL: http://svn.gnome.org/viewvc/brasero?rev=1237&view=rev

Log:
	Fix blank discs size retrieval

	* src/burn-medium.c (brasero_medium_track_set_leadout),
	(brasero_medium_get_sessions_info), (brasero_medium_get_contents):


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

Modified: trunk/src/burn-medium.c
==============================================================================
--- trunk/src/burn-medium.c	(original)
+++ trunk/src/burn-medium.c	Tue Sep  2 08:25:12 2008
@@ -1220,6 +1220,10 @@
 		BRASERO_BURN_LOG ("Using track size %d", leadout->blocks_num);
 	}
 
+	BRASERO_BURN_LOG ("Leadout: start = %llu size = %llu",
+			  leadout->start,
+			  leadout->blocks_num);
+
 	return BRASERO_BURN_OK;
 }
 
@@ -1404,17 +1408,14 @@
 		/* we shouldn't request info on leadout if the disc is closed
 		 * (except for DVD+/- (restricted) RW (see above) */
 		leadout = g_new0 (BraseroMediumTrack, 1);
-		priv->tracks = g_slist_append (priv->tracks, leadout);
 		leadout->start = BRASERO_GET_32 (desc->track_start);
 		leadout->type = BRASERO_MEDIUM_TRACK_LEADOUT;
+		priv->tracks = g_slist_append (priv->tracks, leadout);
 
 		brasero_medium_track_set_leadout (self,
 						  handle,
 						  leadout,
 						  code);
-		BRASERO_BURN_LOG ("Leadout: start = %llu size = %llu",
-				  leadout->start,
-				  leadout->blocks_num);
 	}
 
 	g_free (toc);
@@ -1496,6 +1497,8 @@
 		priv->info |= BRASERO_MEDIUM_BLANK;
 		priv->block_size = 2048;
 
+		priv->first_open_track = BRASERO_FIRST_TRACK_IN_LAST_SESSION (info);
+
 		if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS)
 		||  BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_RESTRICTED))
 			brasero_medium_add_DVD_plus_RW_leadout (self);
@@ -1505,13 +1508,12 @@
 			track->type = BRASERO_MEDIUM_TRACK_LEADOUT;
 			priv->tracks = g_slist_prepend (priv->tracks, track);
 			
-			brasero_medium_track_get_info (self,
-						       FALSE,
-						       track,
-						       1,
-						       handle,
-						       code);
+			brasero_medium_track_set_leadout (self,
+							  handle,
+							  track,
+							  code);
 		}
+
 		goto end;
 	}