Attachment 18872 Details for Bug 17579 – detects DVD-R DL on Linux

[patch] detects DVD-R DL on Linux

hal-dvd-r-dl.diff (text/plain), 3.05 KB, created by Kouhei Sutou on 2008-09-14 20:26:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kouhei Sutou

Created: 2008-09-14 20:26:31 UTC

Size: 3.05 KB

patch

obsolete

>diff --git a/hald/linux/probing/linux_dvd_rw_utils.c b/hald/linux/probing/linux_dvd_rw_utils.c
>index 46c3ad4..179975f 100644
>--- a/hald/linux/probing/linux_dvd_rw_utils.c
>+++ b/hald/linux/probing/linux_dvd_rw_utils.c
>@@ -696,6 +696,8 @@ get_disc_capacity_dvdr_from_type (int fd,
> 		break;
> 
> 	case 0x11:		/* DVD-R */
>+	case 0x15:		/* DVD-R Dual Layer Sequential */
>+	case 0x16:		/* DVD-R Dual Layer Jump */
> 	case 0x1B:		/* DVD+R */
> 	case 0x2B:		/* DVD+R Double Layer */
> 	case 0x41:		/* BD-R SRM */
>diff --git a/hald/linux/probing/probe-volume.c b/hald/linux/probing/probe-volume.c
>index 4293e90..d9ea48d 100644
>--- a/hald/linux/probing/probe-volume.c
>+++ b/hald/linux/probing/probe-volume.c
>@@ -500,6 +500,10 @@ main (int argc, char *argv[])
> 				libhal_changeset_set_property_string (cs, "volume.disc.type", "dvd_rw");
> 				libhal_changeset_set_property_bool (cs, "volume.disc.is_rewritable", TRUE);
> 				break;
>+			case 0x15: /* DVD-R Dual Layer Sequential */
>+			case 0x16: /* DVD-R Dual Layer Jump */
>+				libhal_changeset_set_property_string (cs, "volume.disc.type", "dvd_r_dl");
>+				break;
> 			case 0x1A: /* DVD+RW */
> 				libhal_changeset_set_property_string (cs, "volume.disc.type", "dvd_plus_rw");
> 				libhal_changeset_set_property_bool (cs, "volume.disc.is_rewritable", TRUE);
>diff --git a/libhal-storage/libhal-storage.c b/libhal-storage/libhal-storage.c
>index bd15014..8b9e1b8 100644
>--- a/libhal-storage/libhal-storage.c
>+++ b/libhal-storage/libhal-storage.c
>@@ -412,7 +412,14 @@ libhal_volume_policy_compute_display_name (LibHalDrive *drive, LibHalVolume *vol
> 			else
> 				name = strdup (_("DVD-R"));
> 			break;
>-			
>+
>+		case LIBHAL_VOLUME_DISC_TYPE_DVDR_DL:
>+			if (libhal_volume_disc_is_blank (volume))
>+				name = strdup (_("Blank DVD-R Dual-Layer"));
>+			else
>+				name = strdup (_("DVD-R Dual-Layer"));
>+			break;
>+
> 		case LIBHAL_VOLUME_DISC_TYPE_DVDRW:
> 			if (libhal_volume_disc_is_blank (volume))
> 				name = strdup (_("Blank DVD-RW"));
>@@ -1212,6 +1219,8 @@ libhal_volume_from_udi (LibHalContext *hal_ctx, const char *udi)
> 			vol->disc_type = LIBHAL_VOLUME_DISC_TYPE_DVDR;
> 		} else if (strcmp (disc_type_textual, "dvd_rw") == 0) {
> 			vol->disc_type = LIBHAL_VOLUME_DISC_TYPE_DVDRW;
>+		} else if (strcmp (disc_type_textual, "dvd_r_dl") == 0) {
>+			vol->disc_type = LIBHAL_VOLUME_DISC_TYPE_DVDR_DL;
> 		} else if (strcmp (disc_type_textual, "dvd_plus_r") == 0) {
> 			vol->disc_type = LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR;
> 		} else if (strcmp (disc_type_textual, "dvd_plus_rw") == 0) {
>diff --git a/libhal-storage/libhal-storage.h b/libhal-storage/libhal-storage.h
>index dd3d734..d4ee015 100644
>--- a/libhal-storage/libhal-storage.h
>+++ b/libhal-storage/libhal-storage.h
>@@ -281,7 +281,8 @@ typedef enum {
> 	LIBHAL_VOLUME_DISC_TYPE_HDDVDROM    = 0x0d,
> 	LIBHAL_VOLUME_DISC_TYPE_HDDVDR      = 0x0e,
> 	LIBHAL_VOLUME_DISC_TYPE_HDDVDRW     = 0x0f,
>-	LIBHAL_VOLUME_DISC_TYPE_MO          = 0x10
>+	LIBHAL_VOLUME_DISC_TYPE_MO          = 0x10,
>+	LIBHAL_VOLUME_DISC_TYPE_DVDR_DL     = 0x11
> } LibHalVolumeDiscType;
> 
> LibHalVolume     *libhal_volume_from_udi                      (LibHalContext *hal_ctx,

Actions: View | Splinter Review

Attachments on bug 17579: 18872

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.