brasero r1965 - in trunk: . libbrasero-media

[philippr svn gnome org]

Author: philippr
Date: Thu Feb 19 19:49:05 2009
New Revision: 1965
URL: http://svn.gnome.org/viewvc/brasero?rev=1965&view=rev

Log:
2009-02-19  Philippe Rouquier  <ykw localhost localdomain>

	Changes to make BDR(E) and DVD-RAM appear in the media selection dialog
	Probing was correct for media but drive capabilities had been forgotten

	* libbrasero-media/brasero-drive.c (brasero_drive_init_real):
	* libbrasero-media/brasero-medium.c
	(brasero_medium_can_be_written), (brasero_medium_can_be_rewritten):

Modified:
   trunk/ChangeLog
   trunk/libbrasero-media/brasero-drive.c
   trunk/libbrasero-media/brasero-medium.c

Modified: trunk/libbrasero-media/brasero-drive.c
==============================================================================
--- trunk/libbrasero-media/brasero-drive.c	(original)
+++ trunk/libbrasero-media/brasero-drive.c	Thu Feb 19 19:49:05 2009
@@ -954,6 +954,12 @@
 		priv->caps |= BRASERO_DRIVE_CAPS_DVDR_PLUS_DL;
 	if (libhal_device_get_property_bool (ctx, priv->udi, "storage.cdrom.dvdplusrwdl", NULL))
 		priv->caps |= BRASERO_DRIVE_CAPS_DVDRW_PLUS_DL;
+	if (libhal_device_get_property_bool (ctx, priv->udi, "storage.cdrom.dvdram", NULL))
+		priv->caps |= BRASERO_DRIVE_CAPS_DVDRAM;
+	if (libhal_device_get_property_bool (ctx, priv->udi, "storage.cdrom.bdr", NULL))
+		priv->caps |= BRASERO_DRIVE_CAPS_BDR;
+	if (libhal_device_get_property_bool (ctx, priv->udi, "storage.cdrom.bdre", NULL))
+		priv->caps |= BRASERO_DRIVE_CAPS_BDRW;
 
 	BRASERO_MEDIA_LOG ("Drive caps are %d", priv->caps);
 

Modified: trunk/libbrasero-media/brasero-medium.c
==============================================================================
--- trunk/libbrasero-media/brasero-medium.c	(original)
+++ trunk/libbrasero-media/brasero-medium.c	Thu Feb 19 19:49:05 2009
@@ -3158,6 +3158,16 @@
 	if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS_DL))
 		return (caps & BRASERO_DRIVE_CAPS_DVDRW_PLUS_DL) != 0;
 
+	if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVD_RAM))
+		return (caps & BRASERO_DRIVE_CAPS_DVDRAM) != 0;
+
+	/* All types of BD-R */
+	if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_BD|BRASERO_MEDIUM_WRITABLE))
+		return (caps & BRASERO_DRIVE_CAPS_BDR) != 0;
+
+	if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_BDRE))
+		return (caps & BRASERO_DRIVE_CAPS_BDRW) != 0;
+
 	return FALSE;
 }
 
@@ -3202,6 +3212,12 @@
 	if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVDRW_PLUS_DL))
 		return (caps & BRASERO_DRIVE_CAPS_DVDRW_PLUS_DL) != 0;
 
+	if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_DVD_RAM))
+		return (caps & BRASERO_DRIVE_CAPS_DVDRAM) != 0;
+
+	if (BRASERO_MEDIUM_IS (priv->info, BRASERO_MEDIUM_BDRE))
+		return (caps & BRASERO_DRIVE_CAPS_BDRW) != 0;
+
 	return FALSE;
 }