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

Move discmode things out of sector and over to disc.h and disc.c.

Browse Source
This commit is contained in:
rocky
2005-02-05 14:42:28 +00:00
parent 424a194c3a
commit 81e6bf4c95
7 changed files with 75 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/cdio/cdio.h
View File

@@ -1,5 +1,5 @@
/* -*- c -*- /* -*- c -*-
$Id: cdio.h,v 1.78 2005/01/29 20:54:20 rocky Exp $ $Id: cdio.h,v 1.79 2005/02/05 14:42:28 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -68,6 +68,9 @@ extern "C" {
*/ */
#include <cdio/device.h> #include <cdio/device.h>
/* Disc-related functions. */
#include <cdio/disc.h>
/* Sector (frame, or block)-related functions. Uses driver_return_code_t /* Sector (frame, or block)-related functions. Uses driver_return_code_t
from <cdio/device.h> so it should come after that. from <cdio/device.h> so it should come after that.
*/ */
@@ -79,7 +82,4 @@ extern "C" {
/* Track-related functions. */ /* Track-related functions. */
#include <cdio/track.h> #include <cdio/track.h>
/* Disc-related functions. */
#include <cdio/disc.h>
#endif /* __CDIO_H__ */ #endif /* __CDIO_H__ */

33
include/cdio/disc.h
View File

@@ -1,5 +1,5 @@
/* -*- c -*- /* -*- c -*-
$Id: disc.h,v 1.4 2005/01/24 00:06:31 rocky Exp $ $Id: disc.h,v 1.5 2005/02/05 14:42:28 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -28,6 +28,26 @@
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
/*! disc modes. The first combined from MMC-3 5.29.2.8 (Send CUESHEET)
and GNU/Linux /usr/include/linux/cdrom.h and we've added DVD.
*/
typedef enum {
CDIO_DISC_MODE_CD_DA, /**< CD-DA */
CDIO_DISC_MODE_CD_DATA, /**< CD-ROM form 1 */
CDIO_DISC_MODE_CD_XA, /**< CD-ROM XA form2 */
CDIO_DISC_MODE_CD_MIXED, /**< Some combo of above. */
CDIO_DISC_MODE_DVD_ROM, /**< DVD ROM (e.g. movies) */
CDIO_DISC_MODE_DVD_RAM, /**< DVD-RAM */
CDIO_DISC_MODE_DVD_R, /**< DVD-R */
CDIO_DISC_MODE_DVD_RW, /**< DVD-RW */
CDIO_DISC_MODE_DVD_PR, /**< DVD+R */
CDIO_DISC_MODE_DVD_PRW, /**< DVD+RW */
CDIO_DISC_MODE_DVD_OTHER, /**< Unknown/unclassified DVD type */
CDIO_DISC_MODE_NO_INFO,
CDIO_DISC_MODE_ERROR,
CDIO_DISC_MODE_CD_I /**< CD-i. */
} discmode_t;
extern const char *discmode2str[]; extern const char *discmode2str[];
/*! /*!
@@ -70,6 +90,17 @@ extern "C" {
*/ */
track_t cdio_get_num_tracks (const CdIo_t *p_cdio); track_t cdio_get_num_tracks (const CdIo_t *p_cdio);
/*!
Return true if discmode is some sort of CD.
*/
bool cdio_is_discmode_cdrom (discmode_t discmode);
/*!
Return true if discmode is some sort of DVD.
*/
bool cdio_is_discmode_dvd (discmode_t discmode);
/*! cdio_stat_size is deprecated. @see cdio_get_disc_last_lsn */ /*! cdio_stat_size is deprecated. @see cdio_get_disc_last_lsn */
#define cdio_stat_size cdio_get_disc_last_lsn #define cdio_stat_size cdio_get_disc_last_lsn

4
include/cdio/scsi_mmc.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: scsi_mmc.h,v 1.42 2005/01/29 20:54:20 rocky Exp $ $Id: scsi_mmc.h,v 1.43 2005/02/05 14:42:28 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -64,7 +64,7 @@ typedef enum {
(10 bytes). */ (10 bytes). */
CDIO_MMC_GPCMD_READ_SUBCHANNEL = 0x42, /**< Read Sub-Channel data. CDIO_MMC_GPCMD_READ_SUBCHANNEL = 0x42, /**< Read Sub-Channel data.
(10 bytes). */ (10 bytes). */
CDIO_MMC_GPCMD_READ_TOC = 0x43, /**< Read CD TOC. CDIO_MMC_GPCMD_READ_TOC = 0x43, /**< READ TOC/PMA/ATIP.
(10 bytes). */ (10 bytes). */
CDIO_MMC_GPCMD_READ_HEADER = 0x44, CDIO_MMC_GPCMD_READ_HEADER = 0x44,
CDIO_MMC_GPCMD_PLAY_AUDIO_10 = 0x45, /**< Begin audio playing at CDIO_MMC_GPCMD_PLAY_AUDIO_10 = 0x45, /**< Begin audio playing at

64
include/cdio/sector.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: sector.h,v 1.33 2005/02/05 12:37:35 rocky Exp $ $Id: sector.h,v 1.34 2005/02/05 14:42:28 rocky Exp $
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -81,26 +81,6 @@
MODE2_RAW /**< 2352 byte block length */ MODE2_RAW /**< 2352 byte block length */
} trackmode_t; } trackmode_t;
/*! disc modes. The first combined from MMC-3 5.29.2.8 (Send CUESHEET)
and GNU/Linux /usr/include/linux/cdrom.h and we've added DVD.
*/
typedef enum {
CDIO_DISC_MODE_CD_DA, /**< CD-DA */
CDIO_DISC_MODE_CD_DATA, /**< CD-ROM form 1 */
CDIO_DISC_MODE_CD_XA, /**< CD-ROM XA form2 */
CDIO_DISC_MODE_CD_MIXED, /**< Some combo of above. */
CDIO_DISC_MODE_DVD_ROM, /**< DVD ROM (e.g. movies) */
CDIO_DISC_MODE_DVD_RAM, /**< DVD-RAM */
CDIO_DISC_MODE_DVD_R, /**< DVD-R */
CDIO_DISC_MODE_DVD_RW, /**< DVD-RW */
CDIO_DISC_MODE_DVD_PR, /**< DVD+R */
CDIO_DISC_MODE_DVD_PRW, /**< DVD+RW */
CDIO_DISC_MODE_DVD_OTHER, /**< Unknown/unclassified DVD type */
CDIO_DISC_MODE_NO_INFO,
CDIO_DISC_MODE_ERROR,
CDIO_DISC_MODE_CD_I /**< CD-i. */
} discmode_t;
/*! Information that can be obtained through a Read Subchannel /*! Information that can be obtained through a Read Subchannel
command. command.
*/ */
@@ -324,52 +304,10 @@
*/ */
lba_t cdio_mmssff_to_lba (const char *psz_mmssff); lba_t cdio_mmssff_to_lba (const char *psz_mmssff);
/*!
Return true if discmode is some sort of CD.
*/
bool cdio_is_discmode_cdrom (discmode_t discmode);
/*!
Return true if discmode is some sort of DVD.
*/
bool cdio_is_discmode_dvd (discmode_t discmode);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
static inline bool discmode_is_cd(discmode_t discmode)
{
switch (discmode) {
case CDIO_DISC_MODE_CD_DA:
case CDIO_DISC_MODE_CD_DATA:
case CDIO_DISC_MODE_CD_XA:
case CDIO_DISC_MODE_CD_MIXED:
case CDIO_DISC_MODE_CD_I:
return true;
default:
return false;
}
}
static inline bool discmode_is_dvd(discmode_t discmode)
{
switch (discmode) {
case CDIO_DISC_MODE_DVD_ROM:
case CDIO_DISC_MODE_DVD_RAM:
case CDIO_DISC_MODE_DVD_R:
case CDIO_DISC_MODE_DVD_RW:
case CDIO_DISC_MODE_DVD_PR:
case CDIO_DISC_MODE_DVD_PRW:
case CDIO_DISC_MODE_DVD_OTHER:
return true;
default:
return false;
}
}
#endif /* _CDIO_SECTOR_H_ */ #endif /* _CDIO_SECTOR_H_ */

33
lib/driver/disc.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: disc.c,v 1.4 2005/01/24 00:06:31 rocky Exp $ $Id: disc.c,v 1.5 2005/02/05 14:42:28 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -87,3 +87,34 @@ cdio_get_mcn (const CdIo_t *p_cdio)
return NULL; return NULL;
} }
} }
bool
cdio_is_discmode_cdrom(discmode_t discmode)
{
switch (discmode) {
case CDIO_DISC_MODE_CD_DA:
case CDIO_DISC_MODE_CD_DATA:
case CDIO_DISC_MODE_CD_XA:
case CDIO_DISC_MODE_CD_MIXED:
case CDIO_DISC_MODE_NO_INFO:
return true;
default:
return false;
}
}
bool
cdio_is_discmode_dvd(discmode_t discmode)
{
switch (discmode) {
case CDIO_DISC_MODE_DVD_ROM:
case CDIO_DISC_MODE_DVD_RAM:
case CDIO_DISC_MODE_DVD_R:
case CDIO_DISC_MODE_DVD_RW:
case CDIO_DISC_MODE_DVD_PR:
case CDIO_DISC_MODE_DVD_PRW:
return true;
default:
return false;
}
}

35
lib/driver/sector.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: sector.c,v 1.3 2005/02/05 12:37:35 rocky Exp $ $Id: sector.c,v 1.4 2005/02/05 14:42:28 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
@@ -35,7 +35,7 @@
#include <ctype.h> #include <ctype.h>
static const char _rcsid[] = "$Id: sector.c,v 1.3 2005/02/05 12:37:35 rocky Exp $"; static const char _rcsid[] = "$Id: sector.c,v 1.4 2005/02/05 14:42:28 rocky Exp $";
/*! String of bytes used to identify the beginning of a Mode 1 or /*! String of bytes used to identify the beginning of a Mode 1 or
Mode 2 sector. */ Mode 2 sector. */
@@ -259,37 +259,6 @@ cdio_mmssff_to_lba (const char *psz_mmssff)
return ret; return ret;
} }
bool
cdio_is_discmode_cdrom(discmode_t discmode)
{
switch (discmode) {
case CDIO_DISC_MODE_CD_DA:
case CDIO_DISC_MODE_CD_DATA:
case CDIO_DISC_MODE_CD_XA:
case CDIO_DISC_MODE_CD_MIXED:
case CDIO_DISC_MODE_NO_INFO:
return true;
default:
return false;
}
}
bool
cdio_is_discmode_dvd(discmode_t discmode)
{
switch (discmode) {
case CDIO_DISC_MODE_DVD_ROM:
case CDIO_DISC_MODE_DVD_RAM:
case CDIO_DISC_MODE_DVD_R:
case CDIO_DISC_MODE_DVD_RW:
case CDIO_DISC_MODE_DVD_PR:
case CDIO_DISC_MODE_DVD_PRW:
return true;
default:
return false;
}
}
/* /*
* Local variables: * Local variables:

4
src/cd-info.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cd-info.c,v 1.111 2005/01/27 03:10:06 rocky Exp $ $Id: cd-info.c,v 1.112 2005/02/05 14:42:28 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org> Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org>
@@ -949,7 +949,7 @@ main(int argc, const char *argv[])
discmode2str[discmode]); discmode2str[discmode]);
} }
if (discmode_is_dvd(discmode) && !opts.show_dvd) { if (cdio_is_discmode_dvd(discmode) && !opts.show_dvd) {
printf("No further information currently given for DVDs.\n"); printf("No further information currently given for DVDs.\n");
printf("Use --dvd to override.\n"); printf("Use --dvd to override.\n");
myexit(p_cdio, EXIT_SUCCESS); myexit(p_cdio, EXIT_SUCCESS);