diff --git a/include/cdio/cdio.h b/include/cdio/cdio.h index 4c90aef7..5424f1cb 100644 --- a/include/cdio/cdio.h +++ b/include/cdio/cdio.h @@ -1,5 +1,5 @@ /* -*- 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 Copyright (C) 2003, 2004, 2005 Rocky Bernstein @@ -68,6 +68,9 @@ extern "C" { */ #include +/* Disc-related functions. */ +#include + /* Sector (frame, or block)-related functions. Uses driver_return_code_t from so it should come after that. */ @@ -79,7 +82,4 @@ extern "C" { /* Track-related functions. */ #include -/* Disc-related functions. */ -#include - #endif /* __CDIO_H__ */ diff --git a/include/cdio/disc.h b/include/cdio/disc.h index f8ffb7c8..016d6b2b 100644 --- a/include/cdio/disc.h +++ b/include/cdio/disc.h @@ -1,5 +1,5 @@ /* -*- 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 @@ -28,6 +28,26 @@ extern "C" { #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[]; /*! @@ -70,6 +90,17 @@ extern "C" { */ 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 */ #define cdio_stat_size cdio_get_disc_last_lsn diff --git a/include/cdio/scsi_mmc.h b/include/cdio/scsi_mmc.h index 2504808e..f7dc55e8 100644 --- a/include/cdio/scsi_mmc.h +++ b/include/cdio/scsi_mmc.h @@ -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 @@ -64,7 +64,7 @@ typedef enum { (10 bytes). */ CDIO_MMC_GPCMD_READ_SUBCHANNEL = 0x42, /**< Read Sub-Channel data. (10 bytes). */ - CDIO_MMC_GPCMD_READ_TOC = 0x43, /**< Read CD TOC. + CDIO_MMC_GPCMD_READ_TOC = 0x43, /**< READ TOC/PMA/ATIP. (10 bytes). */ CDIO_MMC_GPCMD_READ_HEADER = 0x44, CDIO_MMC_GPCMD_PLAY_AUDIO_10 = 0x45, /**< Begin audio playing at diff --git a/include/cdio/sector.h b/include/cdio/sector.h index cc208c4f..8dccae07 100644 --- a/include/cdio/sector.h +++ b/include/cdio/sector.h @@ -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 Copyright (C) 2003, 2004, 2005 Rocky Bernstein @@ -81,26 +81,6 @@ MODE2_RAW /**< 2352 byte block length */ } 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 command. */ @@ -324,52 +304,10 @@ */ 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 } #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_ */ diff --git a/lib/driver/disc.c b/lib/driver/disc.c index 746b2e84..72dceb1e 100644 --- a/lib/driver/disc.c +++ b/lib/driver/disc.c @@ -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 Copyright (C) 2001 Herbert Valerio Riedel @@ -87,3 +87,34 @@ cdio_get_mcn (const CdIo_t *p_cdio) 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; + } +} diff --git a/lib/driver/sector.c b/lib/driver/sector.c index 9cf81fce..e1d610f1 100644 --- a/lib/driver/sector.c +++ b/lib/driver/sector.c @@ -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 Copyright (C) 2000 Herbert Valerio Riedel @@ -35,7 +35,7 @@ #include -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 Mode 2 sector. */ @@ -259,37 +259,6 @@ cdio_mmssff_to_lba (const char *psz_mmssff) 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: diff --git a/src/cd-info.c b/src/cd-info.c index 58381740..a6091ef6 100644 --- a/src/cd-info.c +++ b/src/cd-info.c @@ -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 Copyright (C) 1996, 1997, 1998 Gerd Knorr @@ -949,7 +949,7 @@ main(int argc, const char *argv[]) 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("Use --dvd to override.\n"); myexit(p_cdio, EXIT_SUCCESS);