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

Remove all remaining uses of CDIO_MIN_DRIVER, CDIO_MAX_DRIVER, CDIO_MIN_DEVICE_DRIVER or CDIO_MAX_DEVICE_DRIVER.

Browse Source
This commit is contained in:
Nicolas Boullis
2009-07-12 01:13:46 +02:00
committed by Nicolas Boullis
parent b91d147a7a
commit 8e8b18e197
6 changed files with 28 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/libcdio.texi
View File

@@ -1231,7 +1231,7 @@ device that is right for it.
5: main(int argc, const char *argv[]) 5: main(int argc, const char *argv[])
6: @{ 6: @{
7: CdIo_t *p_cdio = cdio_open (NULL, DRIVER_DEVICE); 7: CdIo_t *p_cdio = cdio_open (NULL, DRIVER_DEVICE);
8: driver_id_t driver_id; 8: const driver_id_t *driver_id_p;
9: 9:
10: if (NULL != p_cdio) @{ 10: if (NULL != p_cdio) @{
11: printf("The driver selected is %s\n", cdio_get_driver_name(p_cdio)); 11: printf("The driver selected is %s\n", cdio_get_driver_name(p_cdio));
@@ -1242,11 +1242,11 @@ device that is right for it.
16: printf("Problem in trying to find a driver.\n\n"); 16: printf("Problem in trying to find a driver.\n\n");
17: @} 17: @}
18: 18:
19: for (driver_id=CDIO_MIN_DRIVER; driver_id<=CDIO_MAX_DRIVER; driver_id++) 19: for (driver_id_p=cdio_drivers; *driver_id_p!=DRIVER_UNKNOWN; driver_id_p++)
20: if (cdio_have_driver(driver_id)) 20: if (cdio_have_driver(*driver_id_p))
21: printf("We have: %s\n", cdio_driver_describe(driver_id)); 21: printf("We have: %s\n", cdio_driver_describe(*driver_id_p));
22: else 22: else
23: printf("We don't have: %s\n", cdio_driver_describe(driver_id)); 23: printf("We don't have: %s\n", cdio_driver_describe(*driver_id_p));
24: return 0; 24: return 0;
25: @} 25: @}
@end smallexample @end smallexample

10
example/C++/OO/device.cpp
View File

@@ -125,12 +125,12 @@ main(int argc, const char *argv[])
} }
{ {
driver_id_t driver_id; const driver_id_t *driver_id_p;
for (driver_id=CDIO_MIN_DRIVER; driver_id<=CDIO_MAX_DRIVER; driver_id++) for (driver_id_p=cdio_drivers; *driver_id_p!=DRIVER_UNKNOWN; driver_id_p++)
if (cdio_have_driver(driver_id)) if (cdio_have_driver(*driver_id_p))
printf("We have: %s\n", cdio_driver_describe(driver_id)); printf("We have: %s\n", cdio_driver_describe(*driver_id_p));
else else
printf("We don't have: %s\n", cdio_driver_describe(driver_id)); printf("We don't have: %s\n", cdio_driver_describe(*driver_id_p));
} }
return 0; return 0;

16
example/C++/device.cpp
View File

@@ -97,17 +97,11 @@ print_drive_capabilities(cdio_drive_read_cap_t i_read_cap,
} }
} }
inline
driver_id_t &operator++(driver_id_t &d)
{
return d = driver_id_t(d + 1);
}
int int
main(int argc, const char *argv[]) main(int argc, const char *argv[])
{ {
CdIo_t *p_cdio = cdio_open (NULL, DRIVER_UNKNOWN); CdIo_t *p_cdio = cdio_open (NULL, DRIVER_UNKNOWN);
driver_id_t driver_id; const driver_id_t *driver_id_p;
if (NULL != p_cdio) { if (NULL != p_cdio) {
char *default_device = cdio_get_default_device(p_cdio); char *default_device = cdio_get_default_device(p_cdio);
@@ -131,10 +125,10 @@ main(int argc, const char *argv[])
printf("Problem in trying to find a driver.\n\n"); printf("Problem in trying to find a driver.\n\n");
} }
for (driver_id=CDIO_MIN_DRIVER; driver_id<=CDIO_MAX_DRIVER; ++driver_id) for (driver_id_p=cdio_drivers; *driver_id_p!=DRIVER_UNKNOWN; ++driver_id_p)
if (cdio_have_driver(driver_id)) if (cdio_have_driver(*driver_id_p))
printf("We have: %s\n", cdio_driver_describe(driver_id)); printf("We have: %s\n", cdio_driver_describe(*driver_id_p));
else else
printf("We don't have: %s\n", cdio_driver_describe(driver_id)); printf("We don't have: %s\n", cdio_driver_describe(*driver_id_p));
return 0; return 0;
} }

10
example/device.c
View File

@@ -124,12 +124,12 @@ main(int argc, const char *argv[])
} }
{ {
driver_id_t driver_id; const driver_id_t *driver_id_p;
for (driver_id=CDIO_MIN_DRIVER; driver_id<=CDIO_MAX_DRIVER; driver_id++) for (driver_id_p=cdio_drivers; *driver_id_p!=DRIVER_UNKNOWN; driver_id_p++)
if (cdio_have_driver(driver_id)) if (cdio_have_driver(*driver_id_p))
printf("We have: %s\n", cdio_driver_describe(driver_id)); printf("We have: %s\n", cdio_driver_describe(*driver_id_p));
else else
printf("We don't have: %s\n", cdio_driver_describe(driver_id)); printf("We don't have: %s\n", cdio_driver_describe(*driver_id_p));
} }
return 0; return 0;
} }

8
src/cd-drive.c
View File

@@ -270,12 +270,12 @@ main(int argc, char *argv[])
/* Print out a drivers available */ /* Print out a drivers available */
{ {
driver_id_t driver_id; const driver_id_t *driver_id_p;
printf("Drivers available...\n"); printf("Drivers available...\n");
for (driver_id=CDIO_MIN_DRIVER; driver_id<=CDIO_MAX_DRIVER; driver_id++) for (driver_id_p=cdio_drivers; *driver_id_p!=DRIVER_UNKNOWN; driver_id_p++)
if (cdio_have_driver(driver_id)) { if (cdio_have_driver(*driver_id_p)) {
printf(" %-35s\n", cdio_driver_describe(driver_id)); printf(" %-35s\n", cdio_driver_describe(*driver_id_p));
} }
printf("\n"); printf("\n");
} }

9
src/util.c
View File

@@ -45,8 +45,6 @@ print_version (char *program_name, const char *version,
int no_header, bool version_only) int no_header, bool version_only)
{ {
driver_id_t driver_id;
if (no_header == 0) if (no_header == 0)
report( stdout, report( stdout,
"%s version %s\nCopyright (c) 2003, 2004, 2005, 2007, 2008 R. Bernstein\n", "%s version %s\nCopyright (c) 2003, 2004, 2005, 2007, 2008 R. Bernstein\n",
@@ -59,9 +57,10 @@ PARTICULAR PURPOSE.\n\
if (version_only) { if (version_only) {
char *default_device; char *default_device;
for (driver_id=DRIVER_UNKNOWN+1; driver_id<=CDIO_MAX_DRIVER; driver_id++) { const driver_id_t *driver_id_p;
if (cdio_have_driver(driver_id)) { for (driver_id_p=cdio_drivers; *driver_id_p!=DRIVER_UNKNOWN; driver_id_p++) {
report( stdout, "Have driver: %s\n", cdio_driver_describe(driver_id)); if (cdio_have_driver(*driver_id_p)) {
report( stdout, "Have driver: %s\n", cdio_driver_describe(*driver_id_p));
} }
} }
default_device=cdio_get_default_device(NULL); default_device=cdio_get_default_device(NULL);