brasero r1270 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Fri Sep 12 07:41:34 2008
New Revision: 1270
URL: http://svn.gnome.org/viewvc/brasero?rev=1270&view=rev

Log:
	Fix behaviour where instead of blanking rewritable medium when adding
	new data, brasero was automatically merging the new data

	* src/brasero-dest-selection.c
	(brasero_dest_selection_add_drive_properties_flags):
	* src/burn-caps.c (brasero_burn_caps_get_flags_for_medium),
	(brasero_burn_caps_get_flags):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-dest-selection.c
   trunk/src/burn-caps.c

Modified: trunk/src/brasero-dest-selection.c
==============================================================================
--- trunk/src/brasero-dest-selection.c	(original)
+++ trunk/src/brasero-dest-selection.c	Fri Sep 12 07:41:34 2008
@@ -786,9 +786,6 @@
 		&& (flag & (BRASERO_BURN_FLAG_DAO|BRASERO_BURN_FLAG_RAW)))
 			continue;
 
-		if (compulsory)
-			brasero_burn_session_add_flag (priv->session, compulsory);
-
 		if (supported & flag) {
 			brasero_burn_session_add_flag (priv->session, flag);
 			supported = BRASERO_BURN_FLAG_NONE;
@@ -800,9 +797,12 @@
 		}
 	}
 
-	flags = brasero_burn_session_get_flags (priv->session);
-	if (flags != (flags | compulsory))
-		brasero_burn_session_add_flag (priv->session, compulsory);
+	/* Always set this flag whenever possible */
+	if (supported & BRASERO_BURN_FLAG_BLANK_BEFORE_WRITE) {
+		brasero_burn_session_add_flag (priv->session,
+					       BRASERO_BURN_FLAG_BLANK_BEFORE_WRITE|
+					       BRASERO_BURN_FLAG_FAST_BLANK);
+	}
 
 	/* When copying with same drive don't set write mode, it'll be set later */
 	if (!brasero_burn_session_same_src_dest_drive (priv->session)) {

Modified: trunk/src/burn-caps.c
==============================================================================
--- trunk/src/burn-caps.c	(original)
+++ trunk/src/burn-caps.c	Fri Sep 12 07:41:34 2008
@@ -2485,6 +2485,9 @@
 							   &blank_compulsory);
 		(*supported_flags) |= blank_supported;
 		(*compulsory_flags) |= blank_compulsory;
+
+		/* If BLANK flag is supported then MERGE/APPEND can't be compulsory */
+		(*compulsory_flags) &= ~(BRASERO_BURN_FLAG_MERGE|BRASERO_BURN_FLAG_APPEND);
 	}
 
 	return BRASERO_BURN_OK;
@@ -2683,12 +2686,15 @@
 	
 	/* Let's get flags for recording */
 	media = brasero_burn_session_get_dest_media (session);
-	brasero_burn_caps_get_flags_for_medium (self,
-						media,
-						session_flags,
-						&input,
-						&supported_flags,
-						&compulsory_flags);
+	result = brasero_burn_caps_get_flags_for_medium (self,
+							 media,
+							 session_flags,
+							 &input,
+							 &supported_flags,
+							 &compulsory_flags);
+
+	if (result != BRASERO_BURN_OK)
+		return result;
 
 	supported_flags = brasero_burn_caps_flags_update_for_drive (supported_flags,
 								    session);