include/cdio++ Add pre- and post- increment/decrement operators for

libcdio enums that it makes sense to iterate over.

example/C++/OO/*: use these
example/*: match up C and C++ programs better.
This commit is contained in:
rocky
2005-11-11 12:26:57 +00:00
parent edfc03ac78
commit 91147fd391
11 changed files with 126 additions and 28 deletions

View File

@@ -1,5 +1,5 @@
/*
$Id: cdtext.cpp,v 1.1 2005/11/10 11:11:15 rocky Exp $
$Id: cdtext.cpp,v 1.2 2005/11/11 12:26:57 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -18,9 +18,22 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* Simple program to list CD-Text info of a Compact Disc using libcdio. */
/* Simple program to list CD-Text info of a Compact Disc using
libcdio. See also corresponding C program of a similar name.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_STDIO_H
#include <stdio.h>
#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <cdio++/cdio.hpp>
/* Set up a CD-DA image to test on which is in the libcdio distribution. */
@@ -33,12 +46,10 @@ print_cdtext_track_info(CdioDevice *device, track_t i_track,
cdtext_t *cdtext = device->getCdtext(0);
if (NULL != cdtext) {
cdtext_field_t i;
int j=0;
printf("%s\n", psz_msg);
for (j=0; j < MAX_CDTEXT_FIELDS; j++) {
i = (cdtext_field_t) j;
for (i= (cdtext_field_t) MIN_CDTEXT_FIELD; i < MAX_CDTEXT_FIELDS; i++) {
if (cdtext->field[i]) {
printf("\t%s: %s\n", cdtext_field2str(i), cdtext->field[i]);
}

View File

@@ -1,5 +1,5 @@
/*
$Id: device.cpp,v 1.1 2005/11/10 11:11:15 rocky Exp $
$Id: device.cpp,v 1.2 2005/11/11 12:26:57 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -18,8 +18,9 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* Simple program to show drivers installed and what the default
CD-ROM drive is. */
/* Simple program to show drivers installed and what the default
CD-ROM drive is. See also corresponding C program of a similar
name. */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -123,5 +124,16 @@ main(int argc, const char *argv[])
} else {
printf("Problem in trying to find a driver.\n\n");
}
{
driver_id_t driver_id;
for (driver_id=CDIO_MIN_DRIVER; driver_id<=CDIO_MAX_DRIVER; driver_id++)
if (cdio_have_driver(driver_id))
printf("We have: %s\n", cdio_driver_describe(driver_id));
else
printf("We don't have: %s\n", cdio_driver_describe(driver_id));
}
return 0;
}

View File

@@ -1,5 +1,5 @@
/*
$Id: eject.cpp,v 1.1 2005/11/10 11:11:15 rocky Exp $
$Id: eject.cpp,v 1.2 2005/11/11 12:26:57 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -22,6 +22,8 @@
If a single argument is given, it is used as the CD-ROM device to
eject/close. Otherwise a CD-ROM drive will be scanned for.
See also corresponding C program of a similar name.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"

View File

@@ -1,5 +1,5 @@
/*
$Id: cdtext.c,v 1.2 2005/01/04 04:40:22 rocky Exp $
$Id: cdtext.c,v 1.3 2005/11/11 12:26:57 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -18,12 +18,20 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* Simple program to list CD-Text info of a Compact Disc using libcdio. */
/* Simple program to list CD-Text info of a Compact Disc using
libcdio. See also corresponding C++ programs of similar names. */
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_STDIO_H
#include <stdio.h>
#endif
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#include <cdio/cdio.h>
#include <cdio/cdtext.h>
@@ -77,7 +85,7 @@ main(int argc, const char *argv[])
cdio_destroy(p_cdio);
}
p_cdio = cdio_open (NULL, DRIVER_UNKNOWN);
p_cdio = cdio_open (NULL, DRIVER_DEVICE);
i_first_track = cdio_get_first_track_num(p_cdio);
i_tracks = cdio_get_num_tracks(p_cdio);

View File

@@ -1,5 +1,5 @@
/*
$Id: device.c,v 1.1 2005/02/06 15:09:10 rocky Exp $
$Id: device.c,v 1.2 2005/11/11 12:26:57 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -18,8 +18,9 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/* Simple program to show drivers installed and what the default
CD-ROM drive is. */
/* Simple program to show drivers installed and what the default
CD-ROM drive is. See also corresponding C++ programs of similar
names .*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
@@ -100,7 +101,6 @@ int
main(int argc, const char *argv[])
{
CdIo_t *p_cdio = cdio_open (NULL, DRIVER_UNKNOWN);
driver_id_t driver_id;
if (NULL != p_cdio) {
char *default_device = cdio_get_default_device(p_cdio);
@@ -123,11 +123,14 @@ main(int argc, const char *argv[])
} else {
printf("Problem in trying to find a driver.\n\n");
}
for (driver_id=CDIO_MIN_DRIVER; driver_id<=CDIO_MAX_DRIVER; driver_id++)
if (cdio_have_driver(driver_id))
printf("We have: %s\n", cdio_driver_describe(driver_id));
else
printf("We don't have: %s\n", cdio_driver_describe(driver_id));
{
driver_id_t driver_id;
for (driver_id=CDIO_MIN_DRIVER; driver_id<=CDIO_MAX_DRIVER; driver_id++)
if (cdio_have_driver(driver_id))
printf("We have: %s\n", cdio_driver_describe(driver_id));
else
printf("We don't have: %s\n", cdio_driver_describe(driver_id));
}
return 0;
}

View File

@@ -1,5 +1,5 @@
/*
$Id: eject.c,v 1.1 2005/11/07 07:44:00 rocky Exp $
$Id: eject.c,v 1.2 2005/11/11 12:26:57 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -22,6 +22,8 @@
If a single argument is given, it is used as the CD-ROM device to
eject/close. Otherwise a CD-ROM drive will be scanned for.
See also corresponding C++ program of a similar name.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"