claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Expand getting drive capabilities. We now have 3 masks where we had

Browse Source 
only one before.
This commit is contained in:
rocky
2004-07-17 22:16:46 +00:00
parent c4cd69693c
commit e84c6316b0
33 changed files with 679 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cd-drive.c
View File

@@ -1,5 +1,5 @@
/*
$Id: cd-drive.c,v 1.2 2004/04/25 03:52:37 rocky Exp $
$Id: cd-drive.c,v 1.3 2004/07/17 22:16:47 rocky Exp $
Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
@@ -229,10 +229,14 @@ main(int argc, const char *argv[])
cd_drives = cdio_get_devices(DRIVER_DEVICE);
if (NULL != cd_drives)
for( cd = cd_drives; *cd != NULL; cd++ ) {
cdio_drive_cap_t i_drive_cap = cdio_get_drive_cap_dev(*cd);
cdio_drive_read_cap_t i_read_cap;
cdio_drive_write_cap_t i_write_cap;
cdio_drive_misc_cap_t i_misc_cap;
cdio_get_drive_cap_dev(*cd, &i_read_cap, &i_write_cap, &i_misc_cap);
printf("Drive %s\n", *cd);
print_drive_capabilities(i_drive_cap);
print_drive_capabilities(i_read_cap, i_write_cap, i_misc_cap);
printf("\n");
}
@@ -241,11 +245,15 @@ main(int argc, const char *argv[])
cd_drives = NULL;
} else {
/* Print CD-drive info for given source */
cdio_drive_read_cap_t i_read_cap;
cdio_drive_write_cap_t i_write_cap;
cdio_drive_misc_cap_t i_misc_cap;
cdio_drive_cap_t i_drive_cap = cdio_get_drive_cap_dev(source_name);
cdio_get_drive_cap_dev(source_name, &i_read_cap, &i_write_cap,
&i_misc_cap);
printf("Drive %s\n", source_name);
print_drive_capabilities(i_drive_cap);
print_drive_capabilities(i_read_cap, i_write_cap, i_misc_cap);
printf("\n");
}

10
src/cd-info.c
View File

@@ -1,5 +1,5 @@
/*
$Id: cd-info.c,v 1.72 2004/07/17 02:18:28 rocky Exp $
$Id: cd-info.c,v 1.73 2004/07/17 22:16:47 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org>
@@ -966,8 +966,12 @@ main(int argc, const char *argv[])
}
{
cdio_drive_cap_t i_drive_cap = cdio_get_drive_cap(cdio);
print_drive_capabilities(i_drive_cap);
cdio_drive_read_cap_t i_read_cap;
cdio_drive_write_cap_t i_write_cap;
cdio_drive_misc_cap_t i_misc_cap;
cdio_get_drive_cap(cdio, &i_read_cap, &i_write_cap, &i_misc_cap);
print_drive_capabilities(i_read_cap, i_write_cap, i_misc_cap);
}
if (opts.list_drives) {

94
src/util.c
View File

@@ -1,5 +1,5 @@
/*
$Id: util.c,v 1.9 2004/06/27 16:37:34 rocky Exp $
$Id: util.c,v 1.10 2004/07/17 22:16:48 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -87,52 +87,60 @@ fillout_device_name(const char *device_name)
}
/* Prints out drive capabilities */
void
print_drive_capabilities(cdio_drive_cap_t i_drive_cap)
void print_drive_capabilities(cdio_drive_read_cap_t i_read_cap,
cdio_drive_write_cap_t i_write_cap,
cdio_drive_misc_cap_t i_misc_cap)
{
if (CDIO_DRIVE_CAP_ERROR == i_drive_cap) {
printf("Error in getting drive properties\n");
if (CDIO_DRIVE_CAP_ERROR == i_misc_cap) {
printf("Error in getting drive hardware properties\n");
} else {
printf("Hardware : %s\n",
i_drive_cap & CDIO_DRIVE_CAP_FILE
printf(_("Hardware : %s\n"),
i_misc_cap & CDIO_DRIVE_CAP_MISC_FILE
? "Disk Image" : "CD-ROM or DVD");
printf(_("Can open tray : %s\n"),
i_drive_cap & CDIO_DRIVE_CAP_OPEN_TRAY ? "Yes" : "No");
printf(_("Can close tray : %s\n"),
i_drive_cap & CDIO_DRIVE_CAP_CLOSE_TRAY ? "Yes" : "No");
printf(_("Can disable manual eject: %s\n"),
i_drive_cap & CDIO_DRIVE_CAP_LOCK ? "Yes" : "No");
printf(_("Can select juke-box disc: %s\n\n"),
i_drive_cap & CDIO_DRIVE_CAP_SELECT_DISC ? "Yes" : "No");
printf(_("Can open tray : %s\n"),
i_misc_cap & CDIO_DRIVE_CAP_MISC_OPEN_TRAY ? "Yes" : "No");
printf(_("Can close tray : %s\n"),
i_misc_cap & CDIO_DRIVE_CAP_MISC_CLOSE_TRAY ? "Yes" : "No");
printf(_("Can disable manual eject : %s\n"),
i_misc_cap & CDIO_DRIVE_CAP_MISC_LOCK ? "Yes" : "No");
printf(_("Can select juke-box disc : %s\n\n"),
i_misc_cap & CDIO_DRIVE_CAP_MISC_SELECT_DISC ? "Yes" : "No");
printf(_("Can set drive speed : %s\n"),
i_drive_cap & CDIO_DRIVE_CAP_SELECT_SPEED ? "Yes" : "No");
printf(_("Can detect if CD changed: %s\n"),
i_drive_cap & CDIO_DRIVE_CAP_MEDIA_CHANGED ? "Yes" : "No");
printf(_("Can read Media Cat. No. : %s\n"),
i_drive_cap & CDIO_DRIVE_CAP_MCN ? "Yes" : "No");
printf(_("Can read sessions > 1 . : %s\n"),
i_drive_cap & CDIO_DRIVE_CAP_MULTI_SESSION ? "Yes" : "No");
printf(_("Can hard reset device : %s\n\n"),
i_drive_cap & CDIO_DRIVE_CAP_RESET ? "Yes" : "No");
printf(_("Compact Disc : %s\n"),
i_drive_cap & CDIO_DRIVE_CAP_CD ? "Yes" : "No");
printf(_(" Can play audio : %s\n"),
i_drive_cap & CDIO_DRIVE_CAP_CD_AUDIO ? "Yes" : "No");
printf(_(" Can read CD-RW : %s\n"),
i_drive_cap & CDIO_DRIVE_CAP_CD_RW ? "Yes" : "No");
printf(_(" Can write CD-R : %s\n\n"),
i_drive_cap & CDIO_DRIVE_CAP_CD_R ? "Yes" : "No");
printf(_("Digital Versital Disc : %s\n"),
i_drive_cap & CDIO_DRIVE_CAP_DVD ? "Yes" : "No");
printf(_(" Can write DVD-R : %s\n"),
i_drive_cap & CDIO_DRIVE_CAP_DVD_R ? "Yes" : "No");
printf(_(" Can write DVD-RAM : %s\n"),
i_drive_cap & CDIO_DRIVE_CAP_DVD_RAM ? "Yes" : "No");
printf(_("Can set drive speed : %s\n"),
i_misc_cap & CDIO_DRIVE_CAP_MISC_SELECT_SPEED ? "Yes" : "No");
printf(_("Can detect if CD changed : %s\n"),
i_misc_cap & CDIO_DRIVE_CAP_MISC_MEDIA_CHANGED ? "Yes" : "No");
printf(_("Can read multiple sessions : %s\n"),
i_misc_cap & CDIO_DRIVE_CAP_MISC_MULTI_SESSION ? "Yes" : "No");
printf(_("Can hard reset device : %s\n\n"),
i_misc_cap & CDIO_DRIVE_CAP_MISC_RESET ? "Yes" : "No");
}
if (CDIO_DRIVE_CAP_UNKNOWN == i_drive_cap) {
printf("Not completely sure about drive properties\n\n");
if (CDIO_DRIVE_CAP_ERROR == i_read_cap) {
printf("Error in getting drive reading properties\n");
} else {
printf("Reading....\n");
printf(_(" Can play audio : %s\n"),
i_read_cap & CDIO_DRIVE_CAP_READ_AUDIO ? "Yes" : "No");
printf(_(" Can read CD-R : %s\n"),
i_read_cap & CDIO_DRIVE_CAP_READ_CD_R ? "Yes" : "No");
printf(_(" Can read CD-RW : %s\n"),
i_read_cap & CDIO_DRIVE_CAP_READ_CD_RW ? "Yes" : "No");
printf(_(" Can read DVD-ROM : %s\n"),
i_read_cap & CDIO_DRIVE_CAP_READ_DVD_ROM ? "Yes" : "No");
}
if (CDIO_DRIVE_CAP_ERROR == i_write_cap) {
printf("Error in getting drive writing properties\n");
} else {
printf("\nWriting....\n");
printf(_(" Can write CD-RW : %s\n"),
i_read_cap & CDIO_DRIVE_CAP_READ_CD_RW ? "Yes" : "No");
printf(_(" Can write DVD-R : %s\n"),
i_write_cap & CDIO_DRIVE_CAP_READ_DVD_R ? "Yes" : "No");
printf(_(" Can write DVD-RAM : %s\n"),
i_write_cap & CDIO_DRIVE_CAP_READ_DVD_RAM ? "Yes" : "No");
}
}

7
src/util.h
View File

@@ -1,5 +1,5 @@
/*
$Id: util.h,v 1.4 2004/05/04 02:06:48 rocky Exp $
$Id: util.h,v 1.5 2004/07/17 22:16:48 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -101,6 +101,9 @@ void print_version (char *program_name, const char *version,
char *fillout_device_name(const char *device_name);
/* Prints out drive capabilities */
void print_drive_capabilities(cdio_drive_cap_t i_drive_cap);
void print_drive_capabilities(cdio_drive_read_cap_t p_read_cap,
cdio_drive_write_cap_t p_write_cap,
cdio_drive_misc_cap_t p_misc_cap);
#endif /* UTIL_H */