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> 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 int
main(int argc, const char *argv[]) main(int argc, const char *argv[])
{ {
@@ -64,35 +80,13 @@ main(int argc, const char *argv[])
} }
freeDeviceList(ppsz_cd_drives); freeDeviceList(ppsz_cd_drives);
ppsz_cd_drives = NULL;
printf("-----\n"); print_drive_class("All CD-ROM drives (again)", CDIO_FS_MATCH_ALL);
printf("CD-DA drives...\n"); print_drive_class("CD-DA drives...", CDIO_FS_AUDIO);
ppsz_cd_drives = NULL; print_drive_class("All drives with ISO 9660...", CDIO_FS_ISO_9660);
/* Print out a list of CD-drives with CD-DA's in them. */ print_drive_class("VCD drives...",
ppsz_cd_drives = getDevices(NULL, CDIO_FS_AUDIO); (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);
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);
return 0; return 0;
} }

View File

@@ -1,7 +1,7 @@
/* /*
$Id: drives.c,v 1.2 2005/04/11 01:37:38 rocky Exp $ $Id: drives.c,v 1.3 2006/02/09 18:16:29 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004, 2006 Rocky Bernstein <rocky@panix.com>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@@ -48,6 +48,21 @@ 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) {
char **ppsz_cd_drives=NULL, **c;
printf("%s...\n", psz_msg);
ppsz_cd_drives = cdio_get_devices_with_cap(NULL, bitmask, b_any);
if (NULL != ppsz_cd_drives)
for( c = ppsz_cd_drives; *c != NULL; c++ ) {
printf("Drive %s\n", *c);
}
cdio_free_device_list(ppsz_cd_drives);
printf("-----\n");
}
int int
main(int argc, const char *argv[]) main(int argc, const char *argv[])
{ {
@@ -68,43 +83,12 @@ main(int argc, const char *argv[])
printf("-----\n"); printf("-----\n");
/* Print out a list of CD-drives the harder way. */ /* Print out a list of CD-drives the harder way. */
ppsz_cd_drives = cdio_get_devices_with_cap(NULL, CDIO_FS_MATCH_ALL, false); print_drive_class("All CD-ROM drives (again)", CDIO_FS_MATCH_ALL, false);
print_drive_class("CD-DA drives...", CDIO_FS_AUDIO, false);
if (NULL != ppsz_cd_drives) { print_drive_class("All drives with ISO 9660...", CDIO_FS_ISO_9660, false);
for( c = ppsz_cd_drives; *c != NULL; c++ ) { print_drive_class("VCD drives...",
printf("Drive %s\n", *c); (CDIO_FS_ANAL_SVCD|CDIO_FS_ANAL_CVD|
} CDIO_FS_ANAL_VIDEOCD|CDIO_FS_UNKNOWN), true);
}
cdio_free_device_list(ppsz_cd_drives);
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 = cdio_get_devices_with_cap(NULL, CDIO_FS_AUDIO, false);
if (NULL != ppsz_cd_drives) {
for( c = ppsz_cd_drives; *c != NULL; c++ ) {
printf("drive: %s\n", *c);
}
}
cdio_free_device_list(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 = cdio_get_devices_with_cap(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);
}
}
cdio_free_device_list(ppsz_cd_drives);
return 0; return 0;
} }