Clean up code a little.

This commit is contained in:
rocky
2006-02-09 18:16:29 +00:00
parent 295a7cd1e5
commit 97f00c4da9
2 changed files with 46 additions and 68 deletions

View File

@@ -1,5 +1,5 @@
/*
$Id: drives.cpp,v 1.2 2006/01/25 07:21:52 rocky Exp $
$Id: drives.cpp,v 1.3 2006/02/09 18:16:29 rocky Exp $
Copyright (C) 2003, 2004, 2006 Rocky Bernstein <rocky@panix.com>
@@ -48,6 +48,22 @@ log_handler (cdio_log_level_t level, const char message[])
}
}
static void
print_drive_class(const char *psz_msg, cdio_fs_anal_t bitmask,
bool b_any=false) {
char **ppsz_cd_drives=NULL, **c;
printf("%s...\n", psz_msg);
ppsz_cd_drives = getDevices(NULL, bitmask);
if (NULL != ppsz_cd_drives)
for( c = ppsz_cd_drives; *c != NULL; c++ ) {
printf("Drive %s\n", *c);
}
freeDeviceList(ppsz_cd_drives);
printf("-----\n");
}
int
main(int argc, const char *argv[])
{
@@ -64,35 +80,13 @@ main(int argc, const char *argv[])
}
freeDeviceList(ppsz_cd_drives);
ppsz_cd_drives = NULL;
printf("-----\n");
printf("CD-DA drives...\n");
ppsz_cd_drives = NULL;
/* Print out a list of CD-drives with CD-DA's in them. */
ppsz_cd_drives = getDevices(NULL, CDIO_FS_AUDIO);
if (NULL != ppsz_cd_drives) {
for( c = ppsz_cd_drives; *c != NULL; c++ ) {
printf("drive: %s\n", *c);
}
}
freeDeviceList(ppsz_cd_drives);
printf("-----\n");
ppsz_cd_drives = NULL;
printf("VCD drives...\n");
/* Print out a list of CD-drives with VCD's in them. */
ppsz_cd_drives = getDevices(NULL,
(CDIO_FS_ANAL_SVCD|CDIO_FS_ANAL_CVD|CDIO_FS_ANAL_VIDEOCD|CDIO_FS_UNKNOWN),
true);
if (NULL != ppsz_cd_drives) {
for( c = ppsz_cd_drives; *c != NULL; c++ ) {
printf("drive: %s\n", *c);
}
}
freeDeviceList(ppsz_cd_drives);
print_drive_class("All CD-ROM drives (again)", CDIO_FS_MATCH_ALL);
print_drive_class("CD-DA drives...", CDIO_FS_AUDIO);
print_drive_class("All drives with ISO 9660...", CDIO_FS_ISO_9660);
print_drive_class("VCD drives...",
(CDIO_FS_ANAL_SVCD|CDIO_FS_ANAL_CVD|
CDIO_FS_ANAL_VIDEOCD|CDIO_FS_UNKNOWN), true);
return 0;
}