doxygen changes.

This commit is contained in:
rocky
2003-11-04 12:28:08 +00:00
parent 28cd39064d
commit 05beaf71de
3 changed files with 106 additions and 87 deletions

View File

@@ -1,5 +1,5 @@
/*
$Id: cd_types.h,v 1.4 2003/11/04 04:45:24 rocky Exp $
$Id: cd_types.h,v 1.5 2003/11/04 12:28:08 rocky Exp $
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996,1997,1998 Gerd Knorr <kraxel@bytesex.org>
@@ -27,17 +27,21 @@
extern "C" {
#endif /* __cplusplus */
/*!
Filesystem types we understand. The highest-numbered fs type should
be less than CDIO_FS_MASK defined below.
*/
#define CDIO_FS_AUDIO 1 /* audio only - not really a fs */
/**
* Filesystem types we understand. The highest-numbered fs type should
* be less than CDIO_FS_MASK defined below.
*/
#define CDIO_FS_AUDIO 1 /**< audio only - not really a
filesystem */
#define CDIO_FS_HIGH_SIERRA 2
#define CDIO_FS_ISO_9660 3
#define CDIO_FS_ISO_9660 3 /**< ISO 9660 filesystem */
#define CDIO_FS_INTERACTIVE 4
#define CDIO_FS_HFS 5
#define CDIO_FS_UFS 6
#define CDIO_FS_HFS 5 /**< file system used on the Macintosh
system in MacOS 6 through MacOS 9
and depricated in OSX. */
#define CDIO_FS_UFS 6 /**< Generic Unix file system derived
from the Berkeley fast file
system. */
/**
* EXT2 was the GNU/Linux native filesystem for early kernels. Newer
@@ -54,14 +58,16 @@ extern "C" {
* company. These specs are for making a 3DO Interactive Multiplayer
* which uses a CD-player. Panasonic in the early 90's was the first
* company to manufacture and market a 3DO player.
*/
*/
#define CDIO_FS_3DO 10
#define CDIO_FS_MASK 15 /* Should be 2*n-1 and > above */
#define CDIO_FS_MASK 15 /**< Note: this should be 2**n-1 and
and greater than the highest
CDIO_FS number above */
#define CDIO_FS_UNKNOWN CDIO_FS_MASK
/**
*Macro to extract just the FS type portion defined above
* Macro to extract just the FS type portion defined above
*/
#define CDIO_FSTYPE(fs) (fs & CDIO_FS_MASK)
@@ -78,22 +84,30 @@ extern "C" {
#define CDIO_FS_ANAL_CDTV 256
#define CDIO_FS_ANAL_BOOTABLE 512 /**< CD is bootable */
#define CDIO_FS_ANAL_VIDEOCD 1024 /**< VCD 1.1 */
#define CDIO_FS_ANAL_ROCKRIDGE 2048
#define CDIO_FS_ANAL_JOLIET 4096 /**< Has Joliet extensions */
#define CDIO_FS_ANAL_ROCKRIDGE 2048 /**< Has Rock Ridge Extensions to
ISO 9660 */
#define CDIO_FS_ANAL_JOLIET 4096 /**< Microsoft Joliet extensions
to ISO 9660 */
#define CDIO_FS_ANAL_SVCD 8192 /**< Super VCD or Choiji Video CD */
#define CDIO_FS_ANAL_CVD 16384 /**< Choiji Video CD */
/**
*Pattern which can be used by cdio_get_devices to specify matching
any sort of CD.
*/
* Pattern which can be used by cdio_get_devices to specify matching
* any sort of CD.
*/
#define CDIO_FS_MATCH_ALL (cdio_fs_anal_t) (~CDIO_FS_MASK)
/**
* The type used to return analysis information from
* cdio_guess_cd_type. These fields make sense only for when an ISO 9660
* filesystem is used.
*/
typedef struct
{
unsigned int joliet_level;
char iso_label[33]; /* 32 + 1 for null byte at the end in
unsigned int joliet_level; /**< If has Joliet extensions, this is the
associated level number (i.e. 1, 2, or 3). */
char iso_label[33]; /**< This is 32 + 1 for null byte at the end in
formatting the string */
unsigned int isofs_size;
} cdio_analysis_t;

View File

@@ -1,5 +1,5 @@
/* -*- c -*-
$Id: cdio.h,v 1.31 2003/10/04 23:11:50 rocky Exp $
$Id: cdio.h,v 1.32 2003/11/04 12:28:08 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -25,8 +25,8 @@
#ifndef __CDIO_H__
#define __CDIO_H__
/* Application Interface or Protocol version number. If the public
interface changes, we increase this number.
/** Application Interface or Protocol version number. If the public
* interface changes, we increase this number.
*/
#define CDIO_API_VERSION 1
@@ -43,8 +43,9 @@
#include <cdio/sector.h>
/* Flags specifying the category of device to open or is opened. */
#define CDIO_SRC_IS_DISK_IMAGE_MASK 0x0001
#define CDIO_SRC_IS_DEVICE_MASK 0x0002
#define CDIO_SRC_IS_DISK_IMAGE_MASK 0x0001 /**< Read source is a CD image. */
#define CDIO_SRC_IS_DEVICE_MASK 0x0002 /**< Read source is a CD device. */
#define CDIO_SRC_IS_SCSI_MASK 0x0004
#define CDIO_SRC_IS_NATIVE_MASK 0x0008
@@ -52,55 +53,58 @@
extern "C" {
#endif /* __cplusplus */
/* opaque structure */
/** This is an opaque structure. */
typedef struct _CdIo CdIo;
/* The below enumerations may be used to tag a specific driver
that is opened or is desired to be opened. Note that this is
different than what is available on a given host.
Order is a little significant since the order is used in scans.
We have to start with 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 something
with a higher enumeration number.
NOTE: IF YOU MODIFY ENUM MAKE SURE INITIALIZATION IN CDIO.C AGREES.
/** The below enumerations may be used to tag a specific driver
* that is opened or is desired to be opened. Note that this is
* different than what is available on a given host.
*
* Order is a little significant since the order is used in scans.
* We have to start with 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
* something with a higher enumeration number.
*
* NOTE: IF YOU MODIFY ENUM MAKE SURE INITIALIZATION IN CDIO.C AGREES.
*
*/
typedef enum {
DRIVER_UNKNOWN,
DRIVER_BSDI,
DRIVER_FREEBSD,
DRIVER_LINUX,
DRIVER_SOLARIS,
DRIVER_OSX,
DRIVER_WIN32,
DRIVER_BINCUE, /* Prefer bincue over nrg when both exist */
DRIVER_NRG,
DRIVER_DEVICE /* Is really a set of the above; should come last */
DRIVER_BSDI, /**< BSDI driver */
DRIVER_FREEBSD, /**< FreeBSD driver */
DRIVER_LINUX, /**< GNU/Linux Driver */
DRIVER_SOLARIS, /**< Sun Solaris Driver */
DRIVER_OSX, /**< Apple OSX Driver */
DRIVER_WIN32, /**< Microsoft Windows Driver */
DRIVER_BINCUE, /**< BIN/CUE format CD image. This is listed before NRG,
to make the code prefer BINCUE over NRG when both
exist. */
DRIVER_NRG, /**< Nero NRG format CD image. */
DRIVER_DEVICE /**< Is really a set of the above; should come last */
} driver_id_t;
/* Make sure what's listed below is the last one above. Since we have
a bogus (but useful) 0th entry above we don't have to add one below.
*/
/** Make sure what's listed for CDIO_MIN_DRIVER is the last
enumeration in driver_id_t. Since we have a bogus (but useful) 0th
entry above we don't have to add one below.
*/
#define CDIO_MIN_DRIVER DRIVER_BSDI
#define CDIO_MIN_DEVICE_DRIVER CDIO_MIN_DRIVER
#define CDIO_MAX_DRIVER DRIVER_NRG
#define CDIO_MAX_DEVICE_DRIVER DRIVER_WIN32
typedef enum {
TRACK_FORMAT_AUDIO, /* Audio track, e.g. CD-DA */
TRACK_FORMAT_CDI, /* CD-i. How this is different from DATA below? */
TRACK_FORMAT_XA, /* Mode2 of some sort */
TRACK_FORMAT_DATA, /* Mode1 of some sort */
TRACK_FORMAT_PSX, /* Playstation CD. Like audio but only 2336 bytes
of user data.
TRACK_FORMAT_AUDIO, /**< Audio track, e.g. CD-DA */
TRACK_FORMAT_CDI, /**< CD-i. How this is different from DATA below? */
TRACK_FORMAT_XA, /**< Mode2 of some sort */
TRACK_FORMAT_DATA, /**< Mode1 of some sort */
TRACK_FORMAT_PSX, /**< Playstation CD. Like audio but only 2336 bytes
* of user data.
*/
TRACK_FORMAT_ERROR /* Dunno what is or some other error. */
TRACK_FORMAT_ERROR /**< Dunno what is, or some other error. */
} track_format_t;
/* Printable tags for above enumeration. */
/*! Printable tags for track_format_t enumeration. */
extern const char *track_format2str[6];
/*!
@@ -144,7 +148,7 @@ extern "C" {
char ** cdio_get_devices_with_cap (char* search_devices[],
cdio_fs_anal_t capabilities, bool any);
/*!Return an array of device names. If you want a specific
/*! Return an array of device names. If you want a specific
devices, dor a driver give that device, if you want hardware
devices, give DRIVER_DEVICE and if you want all possible devices,
image drivers and hardware drivers give DRIVER_UNKNOWN.
@@ -190,7 +194,7 @@ extern "C" {
track_t cdio_get_num_tracks (const CdIo *obj);
/*!
Get format of track.
Get the format (audio, mode2, mode1) of track.
*/
track_format_t cdio_get_track_format(const CdIo *obj, track_t track_num);
@@ -326,7 +330,7 @@ extern "C" {
/* Like above but uses the enumeration instead. */
bool cdio_have_driver (driver_id_t driver_id);
/* Return a string decribing driver_id. */
/*! Return a string decribing driver_id. */
const char *cdio_driver_describe (driver_id_t driver_id);
/*! Sets up to read from place specified by source_name and

View File

@@ -1,7 +1,8 @@
/*
$Id: logging.h,v 1.4 2003/11/04 04:45:24 rocky Exp $
$Id: logging.h,v 1.5 2003/11/04 12:28:08 rocky Exp $
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2000, Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003, 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
@@ -107,7 +108,7 @@ void cdio_warn (const char format[], ...) GNUC_PRINTF(1,2);
/**
* Handle an error message.
*
* @see cdio_log for a more generic routine
* @see cdio_log for a more generic routine.
*/
void cdio_error (const char format[], ...) GNUC_PRINTF(1,2);