brasero r1133 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Wed Aug 20 13:41:50 2008
New Revision: 1133
URL: http://svn.gnome.org/viewvc/brasero?rev=1133&view=rev

Log:
	Fix for #538978 â copy CD/DVD button disabled in Brasero
	plus some debugging changes

	* src/burn-caps.c (brasero_caps_image_new),
	(brasero_caps_audio_new), (brasero_caps_data_new),
	(brasero_caps_create_links):
	* src/burn-plugin-manager.c (brasero_plugin_manager_init):


Modified:
   trunk/ChangeLog
   trunk/src/burn-caps.c
   trunk/src/burn-plugin-manager.c

Modified: trunk/src/burn-caps.c
==============================================================================
--- trunk/src/burn-caps.c	(original)
+++ trunk/src/burn-caps.c	Wed Aug 20 13:41:50 2008
@@ -2856,7 +2856,7 @@
 	BRASERO_BURN_LOG_WITH_FULL_TYPE (BRASERO_TRACK_TYPE_IMAGE,
 					 format,
 					 flags,
-					 "Creating new caps");
+					 "New caps required");
 
 	self = brasero_burn_caps_get_default ();
 
@@ -2903,18 +2903,20 @@
 	 * existing caps have the proper IO Flags */
 	retval = brasero_caps_list_check_io (retval, flags);
 
-	if (remaining_format != BRASERO_IMAGE_FORMAT_NONE){
+	if (remaining_format != BRASERO_IMAGE_FORMAT_NONE) {
 		BraseroCaps *caps;
 
 		caps = g_new0 (BraseroCaps, 1);
 		caps->flags = flags;
-		caps->type.subtype.img_format = format;
+		caps->type.subtype.img_format = remaining_format;
 		caps->type.type = BRASERO_TRACK_TYPE_IMAGE;
 
 		self->priv->caps_list = g_slist_insert_sorted (self->priv->caps_list,
 							       caps,
 							       brasero_burn_caps_sort);
 		retval = g_slist_prepend (retval, caps);
+
+		BRASERO_BURN_LOG_TYPE (&caps->type, "Created new caps");
 	}
 
 	return retval;
@@ -2933,7 +2935,7 @@
 	BRASERO_BURN_LOG_WITH_FULL_TYPE (BRASERO_TRACK_TYPE_AUDIO,
 					 format,
 					 flags,
-					 "Creating new caps");
+					 "New caps required");
 
 	self = brasero_burn_caps_get_default ();
 
@@ -3011,6 +3013,8 @@
 							       caps,
 							       brasero_burn_caps_sort);
 		retval = g_slist_prepend (retval, caps);
+
+		BRASERO_BURN_LOG_TYPE (&caps->type, "Created new caps");
 	}
 
 	g_slist_free (encompassing);
@@ -3029,7 +3033,7 @@
 	BRASERO_BURN_LOG_WITH_FULL_TYPE (BRASERO_TRACK_TYPE_DATA,
 					 fs_type,
 					 BRASERO_PLUGIN_IO_NONE,
-					 "Creating new caps");
+					 "New caps required");
 	self = brasero_burn_caps_get_default ();
 
 	for (iter = self->priv->caps_list; iter; iter = iter->next) {
@@ -3389,6 +3393,15 @@
 
 		link = brasero_caps_find_link_for_input (output, input);
 
+#if 0
+
+		/* Mainly for extra debugging */
+		BRASERO_BURN_LOG_TYPE (&output->type, "Linking");
+		BRASERO_BURN_LOG_TYPE (&input->type, "to");
+		BRASERO_BURN_LOG ("with %s", brasero_plugin_get_name (plugin));
+
+#endif
+
 		if (!link) {
 			link = g_new0 (BraseroCapsLink, 1);
 			link->caps = input;

Modified: trunk/src/burn-plugin-manager.c
==============================================================================
--- trunk/src/burn-plugin-manager.c	(original)
+++ trunk/src/burn-plugin-manager.c	Wed Aug 20 13:41:50 2008
@@ -337,9 +337,28 @@
 brasero_plugin_manager_init (BraseroPluginManager *self)
 {
 	guint i = 0;
-	const gchar *name [] = {"libbrasero-dvdrwformat.so",
-				"libbrasero-growisofs.so",
+	const gchar *name [] = {
+				"libbrasero-transcode.so",
+				"libbrasero-checksum.so",
+				"libbrasero-dvdcss.so",
+				"libbrasero-checksum-file.so",
+				"libbrasero-local-track.so",
+				"libbrasero-toc2cue.so",
+				"libbrasero-wodim.so",
 				"libbrasero-readom.so",
+				"libbrasero-dvdrwformat.so",
+				"libbrasero-genisoimage.so",
+				"libbrasero-mkisofs.so",
+				//"libbrasero-normalize.so",
+				"libbrasero-cdrdao.so",
+				//"libbrasero-readcd.so",
+				//"libbrasero-cdrecord.so",
+				"libbrasero-growisofs.so",
+				//"libbrasero-libburn.so",
+				//"libbrasero-libisofs.so",
+				//"libbrasero-vcdimager.so",
+				//"libbrasero-dvdauthor.so",
+				//"libbrasero-vob.so"
 				NULL};
 	BraseroPluginManagerPrivate *priv;