diff options
| author | Danny Kukawka <danny.kukawka@web.de> | 2006-05-09 20:28:01 +0000 |
|---|---|---|
| committer | Danny Kukawka <danny.kukawka@web.de> | 2006-05-09 20:28:01 +0000 |
| commit | 0a1b105ee72bc0fbe7d9d04110162767fcd548d3 (patch) | |
| tree | 442ffc9e73578cff6d69602ef944de31c9589100 /libhal-storage | |
| parent | 7828707f6bac008c23537004e81aae23f00e4aa4 (diff) | |
added property for DVD+RW DL to spec
reworked detection of device capabilities to get correct DVD-RW info and
added DVD+RW DL detection.
fixed mapping of return value of get_dvd_r_rw_profile() related to changes
added property DVD+RW DL
Diffstat (limited to 'libhal-storage')
| -rw-r--r-- | libhal-storage/libhal-storage.c | 4 | ||||
| -rw-r--r-- | libhal-storage/libhal-storage.h | 33 |
2 files changed, 20 insertions, 17 deletions
diff --git a/libhal-storage/libhal-storage.c b/libhal-storage/libhal-storage.c index 1ebf0ff8..1d16faea 100644 --- a/libhal-storage/libhal-storage.c +++ b/libhal-storage/libhal-storage.c @@ -278,7 +278,8 @@ libhal_drive_policy_compute_display_name (LibHalDrive *drive, LibHalVolume *volu } if ((drive_cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDRW) && (drive_cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRW)) { - if(drive_cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRDL) + if(drive_cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRDL || + drive_cdrom_caps & LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL) second = "/DVD±RW DL"; else second = "/DVD±RW"; @@ -932,6 +933,7 @@ libhal_drive_from_udi (LibHalContext *hal_ctx, const char *udi) LIBHAL_PROP_EXTRACT_BOOL_BITFIELD ("storage.cdrom.dvd", drive->cdrom_caps, LIBHAL_DRIVE_CDROM_CAPS_DVDROM); LIBHAL_PROP_EXTRACT_BOOL_BITFIELD ("storage.cdrom.dvdplusr", drive->cdrom_caps, LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSR); LIBHAL_PROP_EXTRACT_BOOL_BITFIELD ("storage.cdrom.dvdplusrw", drive->cdrom_caps, LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRW); + LIBHAL_PROP_EXTRACT_BOOL_BITFIELD ("storage.cdrom.dvdplusrwdl", drive->cdrom_caps, LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL); LIBHAL_PROP_EXTRACT_BOOL_BITFIELD ("storage.cdrom.dvdplusrdl", drive->cdrom_caps, LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRDL); LIBHAL_PROP_EXTRACT_BOOL_BITFIELD ("storage.cdrom.dvdr", drive->cdrom_caps, LIBHAL_DRIVE_CDROM_CAPS_DVDR); LIBHAL_PROP_EXTRACT_BOOL_BITFIELD ("storage.cdrom.dvdrw", drive->cdrom_caps, LIBHAL_DRIVE_CDROM_CAPS_DVDRW); diff --git a/libhal-storage/libhal-storage.h b/libhal-storage/libhal-storage.h index eb43abd5..7ffacc38 100644 --- a/libhal-storage/libhal-storage.h +++ b/libhal-storage/libhal-storage.h @@ -167,22 +167,23 @@ typedef enum { } LibHalDriveType; typedef enum { - LIBHAL_DRIVE_CDROM_CAPS_CDROM = 0x0001, - LIBHAL_DRIVE_CDROM_CAPS_CDR = 0x0002, - LIBHAL_DRIVE_CDROM_CAPS_CDRW = 0x0004, - LIBHAL_DRIVE_CDROM_CAPS_DVDRAM = 0x0008, - LIBHAL_DRIVE_CDROM_CAPS_DVDROM = 0x0010, - LIBHAL_DRIVE_CDROM_CAPS_DVDR = 0x0020, - LIBHAL_DRIVE_CDROM_CAPS_DVDRW = 0x0040, - LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSR = 0x0080, - LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRW = 0x0100, - LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRDL = 0x0200, - LIBHAL_DRIVE_CDROM_CAPS_BDROM = 0x0400, - LIBHAL_DRIVE_CDROM_CAPS_BDR = 0x0800, - LIBHAL_DRIVE_CDROM_CAPS_BDRE = 0x1000, - LIBHAL_DRIVE_CDROM_CAPS_HDDVDROM = 0x2000, - LIBHAL_DRIVE_CDROM_CAPS_HDDVDR = 0x4000, - LIBHAL_DRIVE_CDROM_CAPS_HDDVDRW = 0x8000 + LIBHAL_DRIVE_CDROM_CAPS_CDROM = 0x00001, + LIBHAL_DRIVE_CDROM_CAPS_CDR = 0x00002, + LIBHAL_DRIVE_CDROM_CAPS_CDRW = 0x00004, + LIBHAL_DRIVE_CDROM_CAPS_DVDRAM = 0x00008, + LIBHAL_DRIVE_CDROM_CAPS_DVDROM = 0x00010, + LIBHAL_DRIVE_CDROM_CAPS_DVDR = 0x00020, + LIBHAL_DRIVE_CDROM_CAPS_DVDRW = 0x00040, + LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSR = 0x00080, + LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRW = 0x00100, + LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRDL = 0x00200, + LIBHAL_DRIVE_CDROM_CAPS_DVDPLUSRWDL = 0x00400, + LIBHAL_DRIVE_CDROM_CAPS_BDROM = 0x00800, + LIBHAL_DRIVE_CDROM_CAPS_BDR = 0x01000, + LIBHAL_DRIVE_CDROM_CAPS_BDRE = 0x02000, + LIBHAL_DRIVE_CDROM_CAPS_HDDVDROM = 0x04000, + LIBHAL_DRIVE_CDROM_CAPS_HDDVDR = 0x08000, + LIBHAL_DRIVE_CDROM_CAPS_HDDVDRW = 0x10000 } LibHalDriveCdromCaps; LibHalDrive *libhal_drive_from_udi (LibHalContext *hal_ctx, |