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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

21
example/C++/OO/cdtext.cpp
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]);
}

16
example/C++/OO/device.cpp
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>
@@ -19,7 +19,8 @@
*/
/* Simple program to show drivers installed and what the default
CD-ROM drive is. */
CD-ROM drive is. See also corresponding C program of a similar
name. */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -124,4 +125,15 @@ main(int argc, const char *argv[])
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;
}

4
example/C++/OO/eject.cpp
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"

14
example/cdtext.c
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);

9
example/device.c
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>
@@ -19,7 +19,8 @@
*/
/* Simple program to show drivers installed and what the default
CD-ROM drive is. */
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);
@@ -124,10 +124,13 @@ main(int argc, const char *argv[])
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;
}

4
example/eject.c
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"

3
include/cdio++/Makefile.am
View File

@@ -1,4 +1,4 @@
# $Id: Makefile.am,v 1.1 2005/11/10 11:11:16 rocky Exp $
# $Id: Makefile.am,v 1.2 2005/11/11 12:26:57 rocky Exp $
#
# Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
#
@@ -28,5 +28,6 @@ libcdioinclude_HEADERS = \
device.hpp \
devices.hpp \
disc.hpp \
enum.hpp \
read.hpp \
track.hpp

6
include/cdio++/cdio.hpp
View File

@@ -1,5 +1,5 @@
/* -*- C++ -*-
$Id: cdio.hpp,v 1.1 2005/11/10 11:11:16 rocky Exp $
$Id: cdio.hpp,v 1.2 2005/11/11 12:26:57 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -29,6 +29,10 @@
#include <cdio/cdio.h>
// Make pre- and post-increment operators for enums in libcdio where it
// makes sense.
#include <cdio++/enum.hpp>
class Cdio {
public:

50
include/cdio++/enum.hpp Normal file
View File

@@ -0,0 +1,50 @@
/* -*- C++ -*-
$Id: enum.hpp,v 1.1 2005/11/11 12:26:57 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
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
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
/** \file enum.hpp
*
* \brief C++ header for pre- and post-increment operators for
* enumerations defined in libcdio that it makes sense to iterate over.
*/
#define ENUM_ITERATE_FNS(type) \
inline \
type &operator++(type &t) \
{ \
return t = type(t + 1); \
} \
inline \
type &operator++(type &t, int) \
{ \
return t = type(t + 1); \
} \
inline \
type &operator--(type &t) \
{ \
return t = type(t - 1); \
} \
inline \
type &operator--(type &t, int) \
{ \
return t = type(t - 1); \
}
ENUM_ITERATE_FNS(cdtext_field_t)
ENUM_ITERATE_FNS(driver_id_t)

7
include/cdio/cdtext.h
View File

@@ -1,5 +1,5 @@
/*
$Id: cdtext.h,v 1.12 2005/11/10 00:44:40 rocky Exp $
$Id: cdtext.h,v 1.13 2005/11/11 12:26:57 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
adapted from cuetools
@@ -37,6 +37,7 @@ extern "C" {
#endif /* __cplusplus */
#define MAX_CDTEXT_FIELDS 13
#define MIN_CDTEXT_FIELD 0
/*! \brief structure for holding CD-Text information
@@ -46,7 +47,9 @@ extern "C" {
char *field[MAX_CDTEXT_FIELDS];
};
/*! \brief A list of all of the CD-Text fields */
/*! \brief A list of all of the CD-Text fields. Because
the interval has no gaps, we can use ++ to iterate over fields.
*/
typedef enum {
CDTEXT_ARRANGER = 0, /**< name(s) of the arranger(s) */
CDTEXT_COMPOSER = 1, /**< name(s) of the composer(s) */

4
include/cdio/device.h
View File

@@ -1,5 +1,5 @@
/* -*- c -*-
$Id: device.h,v 1.25 2005/11/07 07:44:00 rocky Exp $
$Id: device.h,v 1.26 2005/11/11 12:26:57 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -136,6 +136,8 @@ extern "C" {
* different than what is available on a given host.
*
* Order is a little significant since the order is used in scans.
* Also the enumeration values are assumed not to leave any holes so
* we can use ++ to iterate over values.
* We have to start with DRIVER_UNKNOWN and devices should come before
* disk-image readers. By putting something towards the top (a lower
* enumeration number), in an iterative scan we prefer that to