GNOME.org
 

brasero r1445 - in trunk: . src src/plugins/cdrkit src/plugins/growisofs src/plugins/libburnia

Author: philippr
Date: Thu Oct 30 12:59:15 2008
New Revision: 1445
URL: http://svn.gnome.org/viewvc/brasero?rev=1445&view=rev

Log:
	(Realized a bit late that) libburn hasn\'t got any overburning capabilities

	* src/burn-drive.c (brasero_drive_can_use_exclusively):
	* src/burn-medium-monitor.c (brasero_medium_monitor_init):
	* src/burn-plugin.h:
	* src/plugins/cdrkit/burn-wodim.c (brasero_wodim_export_caps):
	* src/plugins/growisofs/burn-growisofs.c
	(brasero_growisofs_export_caps):
	* src/plugins/libburnia/burn-libburn.c
	(brasero_libburn_export_caps):


Modified:
   trunk/ChangeLog
   trunk/src/burn-drive.c
   trunk/src/burn-medium-monitor.c
   trunk/src/burn-plugin.h
   trunk/src/plugins/cdrkit/burn-wodim.c
   trunk/src/plugins/growisofs/burn-growisofs.c
   trunk/src/plugins/libburnia/burn-libburn.c

Modified: trunk/src/burn-drive.c
==============================================================================
--- trunk/src/burn-drive.c	(original)
+++ trunk/src/burn-drive.c	Thu Oct 30 12:59:15 2008
@@ -165,7 +165,6 @@
 brasero_drive_can_use_exclusively (BraseroDrive *self)
 {
 	BraseroDeviceHandle *handle;
-	BraseroScsiErrCode code = 0;
 	const gchar *device;
 
 #if defined(HAVE_STRUCT_USCSI_CMD)

Modified: trunk/src/burn-medium-monitor.c
==============================================================================
--- trunk/src/burn-medium-monitor.c	(original)
+++ trunk/src/burn-medium-monitor.c	Thu Oct 30 12:59:15 2008
@@ -293,16 +293,19 @@
 						    "storage.cdrom", &nb_devices,
 						    &error);
 	if (dbus_error_is_set (&error)) {
-		g_warning ("Hal is not running : %s\n", error.message);
+		BRASERO_BURN_LOG ("Hal is not running : %s\n", error.message);
 		dbus_error_free (&error);
 		return;
 	}
 
+	BRASERO_BURN_LOG ("Polling for drives");
 	for (i = 0; i < nb_devices; i++) {
 		/* create the drive */
 		drive = brasero_drive_new (devices [i]);
 		priv->drives = g_slist_prepend (priv->drives, drive);
 
+		BRASERO_BURN_LOG ("Found one drive");
+
 		g_signal_connect (drive,
 				  "medium-added",
 				  G_CALLBACK (brasero_medium_monitor_medium_added_cb),

Modified: trunk/src/burn-plugin.h
==============================================================================
--- trunk/src/burn-plugin.h	(original)
+++ trunk/src/burn-plugin.h	Thu Oct 30 12:59:15 2008
@@ -257,18 +257,19 @@
 	return plugin_name##_type;						\
 }
 
-#define BRASERO_PLUGIN_ADD_STANDARD_CDR_FLAGS(plugin_MACRO)			\
+#define BRASERO_PLUGIN_ADD_STANDARD_CDR_FLAGS(plugin_MACRO, unsupported_MACRO)	\
 	/* Use DAO for first session since AUDIO need it to write CD-TEXT */	\
 	brasero_plugin_set_flags (plugin_MACRO,					\
 				  BRASERO_MEDIUM_CD|				\
 				  BRASERO_MEDIUM_WRITABLE|			\
 				  BRASERO_MEDIUM_BLANK,				\
-				  BRASERO_BURN_FLAG_DAO|			\
+				  (BRASERO_BURN_FLAG_DAO|			\
 				  BRASERO_BURN_FLAG_MULTI|			\
 				  BRASERO_BURN_FLAG_BURNPROOF|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
 				  BRASERO_BURN_FLAG_DUMMY|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_NONE);			\
 	/* This is a CDR with data data can be merged or at least appended */	\
 	brasero_plugin_set_flags (plugin_MACRO,					\
@@ -277,27 +278,29 @@
 				  BRASERO_MEDIUM_APPENDABLE|			\
 				  BRASERO_MEDIUM_HAS_AUDIO|			\
 				  BRASERO_MEDIUM_HAS_DATA,			\
-				  BRASERO_BURN_FLAG_APPEND|			\
+				  (BRASERO_BURN_FLAG_APPEND|			\
 				  BRASERO_BURN_FLAG_MERGE|			\
 				  BRASERO_BURN_FLAG_BURNPROOF|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
 				  BRASERO_BURN_FLAG_MULTI|			\
 				  BRASERO_BURN_FLAG_DUMMY|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_APPEND);
 
-#define BRASERO_PLUGIN_ADD_STANDARD_CDRW_FLAGS(plugin_MACRO)			\
+#define BRASERO_PLUGIN_ADD_STANDARD_CDRW_FLAGS(plugin_MACRO, unsupported_MACRO)			\
 	/* Use DAO for first session since AUDIO needs it to write CD-TEXT */	\
 	brasero_plugin_set_flags (plugin_MACRO,					\
 				  BRASERO_MEDIUM_CD|				\
 				  BRASERO_MEDIUM_REWRITABLE|			\
 				  BRASERO_MEDIUM_BLANK,				\
-				  BRASERO_BURN_FLAG_DAO|			\
+				  (BRASERO_BURN_FLAG_DAO|			\
 				  BRASERO_BURN_FLAG_MULTI|			\
 				  BRASERO_BURN_FLAG_BURNPROOF|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
 				  BRASERO_BURN_FLAG_DUMMY|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_NONE);			\
 	/* It is a CDRW we want the CD to be either blanked before or appended	\
 	 * that's why we set MERGE as compulsory. That way if the CD is not 	\
@@ -309,38 +312,41 @@
 				  BRASERO_MEDIUM_APPENDABLE|			\
 				  BRASERO_MEDIUM_HAS_AUDIO|			\
 				  BRASERO_MEDIUM_HAS_DATA,			\
-				  BRASERO_BURN_FLAG_APPEND|			\
+				  (BRASERO_BURN_FLAG_APPEND|			\
 				  BRASERO_BURN_FLAG_MERGE|			\
 				  BRASERO_BURN_FLAG_BURNPROOF|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
 				  BRASERO_BURN_FLAG_MULTI|			\
 				  BRASERO_BURN_FLAG_DUMMY|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_MERGE);
 
-#define BRASERO_PLUGIN_ADD_STANDARD_DVDR_FLAGS(plugin_MACRO)			\
+#define BRASERO_PLUGIN_ADD_STANDARD_DVDR_FLAGS(plugin_MACRO, unsupported_MACRO)			\
 	/* DAO and MULTI are exclusive */					\
 	brasero_plugin_set_flags (plugin_MACRO,					\
 				  BRASERO_MEDIUM_DVDR|				\
 				  BRASERO_MEDIUM_DUAL_L|			\
 				  BRASERO_MEDIUM_JUMP|				\
 				  BRASERO_MEDIUM_BLANK,				\
-				  BRASERO_BURN_FLAG_DAO|			\
+				  (BRASERO_BURN_FLAG_DAO|			\
 				  BRASERO_BURN_FLAG_BURNPROOF|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
 				  BRASERO_BURN_FLAG_DUMMY|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_NONE);			\
 	brasero_plugin_set_flags (plugin_MACRO,					\
 				  BRASERO_MEDIUM_DVDR|				\
 				  BRASERO_MEDIUM_DUAL_L|			\
 				  BRASERO_MEDIUM_JUMP|				\
 				  BRASERO_MEDIUM_BLANK,				\
-				  BRASERO_BURN_FLAG_BURNPROOF|			\
+				  (BRASERO_BURN_FLAG_BURNPROOF|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
 				  BRASERO_BURN_FLAG_MULTI|			\
 				  BRASERO_BURN_FLAG_DUMMY|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_NONE);			\
 	/* This is a DVDR with data data can be merged or at least appended */	\
 	brasero_plugin_set_flags (plugin_MACRO,					\
@@ -349,34 +355,37 @@
 				  BRASERO_MEDIUM_JUMP|				\
 				  BRASERO_MEDIUM_APPENDABLE|			\
 				  BRASERO_MEDIUM_HAS_DATA,			\
-				  BRASERO_BURN_FLAG_APPEND|			\
+				  (BRASERO_BURN_FLAG_APPEND|			\
 				  BRASERO_BURN_FLAG_MERGE|			\
 				  BRASERO_BURN_FLAG_BURNPROOF|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
 				  BRASERO_BURN_FLAG_MULTI|			\
 				  BRASERO_BURN_FLAG_DUMMY|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_APPEND);
 
-#define BRASERO_PLUGIN_ADD_STANDARD_DVDR_PLUS_FLAGS(plugin_MACRO)		\
+#define BRASERO_PLUGIN_ADD_STANDARD_DVDR_PLUS_FLAGS(plugin_MACRO, unsupported_MACRO)		\
 	/* DVD+R don't have a DUMMY mode */					\
 	brasero_plugin_set_flags (plugin_MACRO,					\
 				  BRASERO_MEDIUM_DVDR_PLUS|			\
 				  BRASERO_MEDIUM_DUAL_L|			\
 				  BRASERO_MEDIUM_BLANK,				\
-				  BRASERO_BURN_FLAG_DAO|			\
+				  (BRASERO_BURN_FLAG_DAO|			\
 				  BRASERO_BURN_FLAG_BURNPROOF|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_NONE);			\
 	brasero_plugin_set_flags (plugin_MACRO,					\
 				  BRASERO_MEDIUM_DVDR_PLUS|			\
 				  BRASERO_MEDIUM_DUAL_L|			\
 				  BRASERO_MEDIUM_BLANK,				\
-				  BRASERO_BURN_FLAG_BURNPROOF|			\
+				  (BRASERO_BURN_FLAG_BURNPROOF|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
 				  BRASERO_BURN_FLAG_MULTI|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_NONE);			\
 	/* DVD+R with data: data can be merged or at least appended */		\
 	brasero_plugin_set_flags (plugin_MACRO,					\
@@ -384,33 +393,36 @@
 				  BRASERO_MEDIUM_DUAL_L|			\
 				  BRASERO_MEDIUM_APPENDABLE|			\
 				  BRASERO_MEDIUM_HAS_DATA,			\
-				  BRASERO_BURN_FLAG_MERGE|			\
+				  (BRASERO_BURN_FLAG_MERGE|			\
 				  BRASERO_BURN_FLAG_APPEND|			\
 				  BRASERO_BURN_FLAG_BURNPROOF|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
 				  BRASERO_BURN_FLAG_MULTI|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_APPEND);
 
-#define BRASERO_PLUGIN_ADD_STANDARD_DVDRW_FLAGS(plugin_MACRO)			\
+#define BRASERO_PLUGIN_ADD_STANDARD_DVDRW_FLAGS(plugin_MACRO, unsupported_MACRO)			\
 	brasero_plugin_set_flags (plugin_MACRO,					\
 				  BRASERO_MEDIUM_DVDRW|				\
 				  BRASERO_MEDIUM_UNFORMATTED|			\
 				  BRASERO_MEDIUM_BLANK,				\
-				  BRASERO_BURN_FLAG_DAO|			\
+				  (BRASERO_BURN_FLAG_DAO|			\
 				  BRASERO_BURN_FLAG_BURNPROOF|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
 				  BRASERO_BURN_FLAG_DUMMY|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_NONE);			\
 	brasero_plugin_set_flags (plugin_MACRO,					\
 				  BRASERO_MEDIUM_DVDRW|				\
 				  BRASERO_MEDIUM_BLANK,				\
-				  BRASERO_BURN_FLAG_BURNPROOF|			\
+				  (BRASERO_BURN_FLAG_BURNPROOF|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
 				  BRASERO_BURN_FLAG_MULTI|			\
 				  BRASERO_BURN_FLAG_DUMMY|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_NONE);			\
 	/* This is a DVDRW we want the DVD to be either blanked before or	\
 	 * appended that's why we set MERGE as compulsory. That way if the DVD	\
@@ -420,13 +432,14 @@
 				  BRASERO_MEDIUM_DVDRW|				\
 				  BRASERO_MEDIUM_APPENDABLE|			\
 				  BRASERO_MEDIUM_HAS_DATA,			\
-				  BRASERO_BURN_FLAG_MERGE|			\
+				  (BRASERO_BURN_FLAG_MERGE|			\
 				  BRASERO_BURN_FLAG_APPEND|			\
 				  BRASERO_BURN_FLAG_BURNPROOF|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
 				  BRASERO_BURN_FLAG_MULTI|			\
 				  BRASERO_BURN_FLAG_DUMMY|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_MERGE);
 
 /**
@@ -437,15 +450,16 @@
  * since they don't behave and are not written in the same way.
  * They also can't be closed so MULTI is compulsory.
  */
-#define BRASERO_PLUGIN_ADD_STANDARD_DVDRW_PLUS_FLAGS(plugin_MACRO)		\
+#define BRASERO_PLUGIN_ADD_STANDARD_DVDRW_PLUS_FLAGS(plugin_MACRO, unsupported_MACRO)		\
 	brasero_plugin_set_flags (plugin_MACRO,					\
 				  BRASERO_MEDIUM_DVDRW_PLUS|			\
 				  BRASERO_MEDIUM_DUAL_L|			\
 				  BRASERO_MEDIUM_UNFORMATTED|			\
 				  BRASERO_MEDIUM_BLANK,				\
-				  BRASERO_BURN_FLAG_MULTI|			\
+				  (BRASERO_BURN_FLAG_MULTI|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_MULTI);			\
 	brasero_plugin_set_flags (plugin_MACRO,					\
 				  BRASERO_MEDIUM_DVDRW_PLUS|			\
@@ -453,26 +467,28 @@
 				  BRASERO_MEDIUM_APPENDABLE|			\
 				  BRASERO_MEDIUM_CLOSED|			\
 				  BRASERO_MEDIUM_HAS_DATA,			\
-				  BRASERO_BURN_FLAG_MULTI|			\
+				  (BRASERO_BURN_FLAG_MULTI|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
 				  BRASERO_BURN_FLAG_NOGRACE|			\
-				  BRASERO_BURN_FLAG_MERGE,			\
+				  BRASERO_BURN_FLAG_MERGE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_MULTI);
 
 /**
  * The above statement apply to these as well. There is no longer dummy mode
  * NOTE: there is no such thing as a DVD-RW DL.
  */
-#define BRASERO_PLUGIN_ADD_STANDARD_DVDRW_RESTRICTED_FLAGS(plugin_MACRO)	\
+#define BRASERO_PLUGIN_ADD_STANDARD_DVDRW_RESTRICTED_FLAGS(plugin_MACRO, unsupported_MACRO)	\
 	brasero_plugin_set_flags (plugin_MACRO,					\
 				  BRASERO_MEDIUM_DVD|				\
 				  BRASERO_MEDIUM_RESTRICTED|			\
 				  BRASERO_MEDIUM_REWRITABLE|			\
 				  BRASERO_MEDIUM_UNFORMATTED|			\
 				  BRASERO_MEDIUM_BLANK,				\
-				  BRASERO_BURN_FLAG_MULTI|			\
+				  (BRASERO_BURN_FLAG_MULTI|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_MULTI);			\
 	brasero_plugin_set_flags (plugin_MACRO,					\
 				  BRASERO_MEDIUM_DVD|				\
@@ -481,13 +497,14 @@
 				  BRASERO_MEDIUM_APPENDABLE|			\
 				  BRASERO_MEDIUM_CLOSED|			\
 				  BRASERO_MEDIUM_HAS_DATA,			\
-				  BRASERO_BURN_FLAG_MULTI|			\
+				  (BRASERO_BURN_FLAG_MULTI|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
 				  BRASERO_BURN_FLAG_NOGRACE|			\
-				  BRASERO_BURN_FLAG_MERGE,			\
+				  BRASERO_BURN_FLAG_MERGE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_MULTI);
 
-#define BRASERO_PLUGIN_ADD_STANDARD_BD_R_FLAGS(plugin_MACRO)			\
+#define BRASERO_PLUGIN_ADD_STANDARD_BD_R_FLAGS(plugin_MACRO, unsupported_MACRO)			\
 	/* DAO and MULTI are exclusive */					\
 	brasero_plugin_set_flags (plugin_MACRO,					\
 				  BRASERO_MEDIUM_BDR_RANDOM|			\
@@ -495,10 +512,11 @@
 				  BRASERO_MEDIUM_BDR_SRM_POW|			\
 				  BRASERO_MEDIUM_DUAL_L|			\
 				  BRASERO_MEDIUM_BLANK,				\
-				  BRASERO_BURN_FLAG_DAO|			\
+				  (BRASERO_BURN_FLAG_DAO|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
 				  BRASERO_BURN_FLAG_DUMMY|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_NONE);			\
 	brasero_plugin_set_flags (plugin_MACRO,					\
 				  BRASERO_MEDIUM_BDR_RANDOM|			\
@@ -506,10 +524,11 @@
 				  BRASERO_MEDIUM_BDR_SRM_POW|			\
 				  BRASERO_MEDIUM_DUAL_L|			\
 				  BRASERO_MEDIUM_BLANK,				\
-				  BRASERO_BURN_FLAG_OVERBURN|			\
+				  (BRASERO_BURN_FLAG_OVERBURN|			\
 				  BRASERO_BURN_FLAG_MULTI|			\
 				  BRASERO_BURN_FLAG_DUMMY|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_NONE);			\
 	/* This is a DVDR with data data can be merged or at least appended */	\
 	brasero_plugin_set_flags (plugin_MACRO,					\
@@ -519,12 +538,13 @@
 				  BRASERO_MEDIUM_DUAL_L|			\
 				  BRASERO_MEDIUM_APPENDABLE|			\
 				  BRASERO_MEDIUM_HAS_DATA,			\
-				  BRASERO_BURN_FLAG_APPEND|			\
+				  (BRASERO_BURN_FLAG_APPEND|			\
 				  BRASERO_BURN_FLAG_MERGE|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
 				  BRASERO_BURN_FLAG_MULTI|			\
 				  BRASERO_BURN_FLAG_DUMMY|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_APPEND);
 
 /**
@@ -535,15 +555,16 @@
  * since they don't behave and are not written in the same way.
  * They also can't be closed so MULTI is compulsory.
  */
-#define BRASERO_PLUGIN_ADD_STANDARD_BD_RE_FLAGS(plugin_MACRO)			\
+#define BRASERO_PLUGIN_ADD_STANDARD_BD_RE_FLAGS(plugin_MACRO, unsupported_MACRO)			\
 	brasero_plugin_set_flags (plugin_MACRO,					\
 				  BRASERO_MEDIUM_DVDRW_PLUS|			\
 				  BRASERO_MEDIUM_DUAL_L|			\
 				  BRASERO_MEDIUM_UNFORMATTED|			\
 				  BRASERO_MEDIUM_BLANK,				\
-				  BRASERO_BURN_FLAG_MULTI|			\
+				  (BRASERO_BURN_FLAG_MULTI|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
-				  BRASERO_BURN_FLAG_NOGRACE,			\
+				  BRASERO_BURN_FLAG_NOGRACE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_MULTI);			\
 	brasero_plugin_set_flags (plugin_MACRO,					\
 				  BRASERO_MEDIUM_DVDRW_PLUS|			\
@@ -551,10 +572,11 @@
 				  BRASERO_MEDIUM_APPENDABLE|			\
 				  BRASERO_MEDIUM_CLOSED|			\
 				  BRASERO_MEDIUM_HAS_DATA,			\
-				  BRASERO_BURN_FLAG_MULTI|			\
+				  (BRASERO_BURN_FLAG_MULTI|			\
 				  BRASERO_BURN_FLAG_OVERBURN|			\
 				  BRASERO_BURN_FLAG_NOGRACE|			\
-				  BRASERO_BURN_FLAG_MERGE,			\
+				  BRASERO_BURN_FLAG_MERGE) &			\
+				  (~unsupported_MACRO),				\
 				  BRASERO_BURN_FLAG_MULTI);
 G_END_DECLS
 

Modified: trunk/src/plugins/cdrkit/burn-wodim.c
==============================================================================
--- trunk/src/plugins/cdrkit/burn-wodim.c	(original)
+++ trunk/src/plugins/cdrkit/burn-wodim.c	Thu Oct 30 12:59:15 2008
@@ -1086,8 +1086,8 @@
 	g_slist_free (input);
 
 	/* Flags for CD (RW)s */
-	BRASERO_PLUGIN_ADD_STANDARD_CDR_FLAGS (plugin);
-	BRASERO_PLUGIN_ADD_STANDARD_CDRW_FLAGS (plugin);
+	BRASERO_PLUGIN_ADD_STANDARD_CDR_FLAGS (plugin, BRASERO_BURN_FLAG_NONE);
+	BRASERO_PLUGIN_ADD_STANDARD_CDRW_FLAGS (plugin, BRASERO_BURN_FLAG_NONE);
 
 	/* Apart from DAO it also supports RAW mode to burn CLONE images. This
 	 * is a special mode for which there isn't any DUMMY burn possible */

Modified: trunk/src/plugins/growisofs/burn-growisofs.c
==============================================================================
--- trunk/src/plugins/growisofs/burn-growisofs.c	(original)
+++ trunk/src/plugins/growisofs/burn-growisofs.c	Thu Oct 30 12:59:15 2008
@@ -812,23 +812,23 @@
 	g_slist_free (input);
 
 	/* For DVD-W and DVD-RW sequential */
-	BRASERO_PLUGIN_ADD_STANDARD_DVDR_FLAGS (plugin);
-	BRASERO_PLUGIN_ADD_STANDARD_DVDRW_FLAGS (plugin);
+	BRASERO_PLUGIN_ADD_STANDARD_DVDR_FLAGS (plugin, BRASERO_BURN_FLAG_NONE);
+	BRASERO_PLUGIN_ADD_STANDARD_DVDRW_FLAGS (plugin, BRASERO_BURN_FLAG_NONE);
 
 	/* see NOTE for DVD-RW restricted overwrite below */
-	BRASERO_PLUGIN_ADD_STANDARD_DVDRW_RESTRICTED_FLAGS (plugin);
+	BRASERO_PLUGIN_ADD_STANDARD_DVDRW_RESTRICTED_FLAGS (plugin, BRASERO_BURN_FLAG_NONE);
 
 	/* DVD+ W */
-	BRASERO_PLUGIN_ADD_STANDARD_DVDR_PLUS_FLAGS (plugin);
+	BRASERO_PLUGIN_ADD_STANDARD_DVDR_PLUS_FLAGS (plugin, BRASERO_BURN_FLAG_NONE);
 
 	/* for DVD+RW */
-	BRASERO_PLUGIN_ADD_STANDARD_DVDRW_PLUS_FLAGS (plugin);
+	BRASERO_PLUGIN_ADD_STANDARD_DVDRW_PLUS_FLAGS (plugin, BRASERO_BURN_FLAG_NONE);
 
 	/* for BD-R */
-	BRASERO_PLUGIN_ADD_STANDARD_BD_R_FLAGS (plugin);
+	BRASERO_PLUGIN_ADD_STANDARD_BD_R_FLAGS (plugin, BRASERO_BURN_FLAG_NONE);
 
 	/* for BD-RE */
-	BRASERO_PLUGIN_ADD_STANDARD_BD_RE_FLAGS (plugin);
+	BRASERO_PLUGIN_ADD_STANDARD_BD_RE_FLAGS (plugin, BRASERO_BURN_FLAG_NONE);
 
 	/* blank caps for +/restricted RW */
 	output = brasero_caps_disc_new (BRASERO_MEDIUM_DVD|

Modified: trunk/src/plugins/libburnia/burn-libburn.c
==============================================================================
--- trunk/src/plugins/libburnia/burn-libburn.c	(original)
+++ trunk/src/plugins/libburnia/burn-libburn.c	Thu Oct 30 12:59:15 2008
@@ -879,9 +879,11 @@
 			       "Philippe Rouquier",
 			       15);
 
+	/* libburn has no OVERBURN capabilities */
+
 	/* CD(R)W */
-	BRASERO_PLUGIN_ADD_STANDARD_CDR_FLAGS (plugin);
-	BRASERO_PLUGIN_ADD_STANDARD_CDRW_FLAGS (plugin);
+	BRASERO_PLUGIN_ADD_STANDARD_CDR_FLAGS (plugin, BRASERO_BURN_FLAG_OVERBURN);
+	BRASERO_PLUGIN_ADD_STANDARD_CDRW_FLAGS (plugin, BRASERO_BURN_FLAG_OVERBURN);
 
 	/* audio support for CDs only */
 	input = brasero_caps_audio_new (BRASERO_PLUGIN_IO_ACCEPT_PIPE|
@@ -906,15 +908,15 @@
 	brasero_plugin_link_caps (plugin, output, input);
 	g_slist_free (output);
 
-	BRASERO_PLUGIN_ADD_STANDARD_DVDR_PLUS_FLAGS (plugin);
-	BRASERO_PLUGIN_ADD_STANDARD_DVDR_FLAGS (plugin);
+	BRASERO_PLUGIN_ADD_STANDARD_DVDR_PLUS_FLAGS (plugin, BRASERO_BURN_FLAG_OVERBURN);
+	BRASERO_PLUGIN_ADD_STANDARD_DVDR_FLAGS (plugin, BRASERO_BURN_FLAG_OVERBURN);
 
 	/* ... and DVD-RW (sequential) */
 	output = brasero_caps_disc_new (media_dvd_rw);
 	brasero_plugin_link_caps (plugin, output, input);
 	g_slist_free (output);
 
-	BRASERO_PLUGIN_ADD_STANDARD_DVDRW_FLAGS (plugin);
+	BRASERO_PLUGIN_ADD_STANDARD_DVDRW_FLAGS (plugin, BRASERO_BURN_FLAG_OVERBURN);
 
 	/* for DVD+/-RW restricted */
 	output = brasero_caps_disc_new (media_dvd_rw_plus);
@@ -922,8 +924,8 @@
 	g_slist_free (output);
 	g_slist_free (input);
 
-	BRASERO_PLUGIN_ADD_STANDARD_DVDRW_RESTRICTED_FLAGS (plugin);
-	BRASERO_PLUGIN_ADD_STANDARD_DVDRW_PLUS_FLAGS (plugin);
+	BRASERO_PLUGIN_ADD_STANDARD_DVDRW_RESTRICTED_FLAGS (plugin, BRASERO_BURN_FLAG_OVERBURN);
+	BRASERO_PLUGIN_ADD_STANDARD_DVDRW_PLUS_FLAGS (plugin, BRASERO_BURN_FLAG_OVERBURN);
 
 	/* add blank caps */
 	output = brasero_caps_disc_new (BRASERO_MEDIUM_CD|
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]