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

Move track things out off sector.h

Browse Source
This commit is contained in:
rocky
2005-02-06 04:20:25 +00:00
parent 20acbc8d07
commit fc60baec9c
5 changed files with 53 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/cdio/device.h
View File

@@ -1,5 +1,5 @@
/* -*- c -*-
$Id: device.h,v 1.10 2005/02/05 04:23:21 rocky Exp $
$Id: device.h,v 1.11 2005/02/06 04:20:25 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -21,7 +21,7 @@
/** \file device.h
*
* \brief The top-level header for driver- or device-related libcdio
* calls. ("device" include CD-image reading devices).
* calls. ("device" includes CD-image reading devices).
*/
#ifndef __CDIO_DEVICE_H__
#define __CDIO_DEVICE_H__

40
include/cdio/sector.h
View File

@@ -1,5 +1,5 @@
/*
$Id: sector.h,v 1.34 2005/02/05 14:42:28 rocky Exp $
$Id: sector.h,v 1.35 2005/02/06 04:20:25 rocky Exp $
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
@@ -67,20 +67,6 @@
#include <cdio/types.h>
/*! track modes (Table 350)
reference: MMC-3 draft revsion - 10g
*/
typedef enum {
AUDIO, /**< 2352 byte block length */
MODE1, /**< 2048 byte block length */
MODE1_RAW, /**< 2352 byte block length */
MODE2, /**< 2336 byte block length */
MODE2_FORM1, /**< 2048 byte block length */
MODE2_FORM2, /**< 2324 byte block length */
MODE2_FORM_MIX, /**< 2336 byte block length */
MODE2_RAW /**< 2352 byte block length */
} trackmode_t;
/*! Information that can be obtained through a Read Subchannel
command.
*/
@@ -185,30 +171,6 @@
{0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0};
*/
/*! An enumeration for some of the CDIO_CDROM_* #defines below. This
isn't really an enumeration one would really use in a program; it
is to be helpful in debuggers where wants just to refer to the
CDIO_CDROM_* names and get something.
*/
extern enum cdio_cdrom_enums {
CDIO_CDROM_LBA =0x01, /**< "logical block": first frame is #0 */
CDIO_CDROM_MSF =0x02, /**< "minute-second-frame": binary, not
BCD here! */
CDIO_CDROM_DATA_TRACK = 0x04,
CDIO_CDROM_CDI_TRACK = 0x10,
CDIO_CDROM_XA_TRACK = 0x20
} cdio_cdrom_enums;
/*! CD-ROM address types (GNU/Linux e.g. cdrom_tocentry.cdte_format) */
#define CDIO_CDROM_LBA 0x01 /**< "logical block": first frame is #0 */
#define CDIO_CDROM_MSF 0x02 /**< "minute-second-frame": binary, not
BCD here! */
/*! CD-ROM track format types (GNU/Linux cdte_ctrl) */
#define CDIO_CDROM_DATA_TRACK 0x04
#define CDIO_CDROM_CDI_TRACK 0x10
#define CDIO_CDROM_XA_TRACK 0x20
/*! An enumeration for some of the M2*_SECTOR_SIZE #defines
below. This isn't really an enumeration one would really use in a
program it is to be helpful in debuggers where wants just to refer

45
include/cdio/track.h
View File

@@ -1,5 +1,5 @@
/* -*- c -*-
$Id: track.h,v 1.6 2005/01/29 20:54:20 rocky Exp $
$Id: track.h,v 1.7 2005/02/06 04:20:25 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -76,6 +76,49 @@ extern "C" {
*/
} track_flags_t;
/*! An enumeration for some of the CDIO_CDROM_* #defines below. This
isn't really an enumeration one would really use in a program; it
is to be helpful in debuggers where wants just to refer to the
CDIO_CDROM_* names and get something.
*/
extern enum cdio_track_enums {
CDIO_CDROM_LBA = 0x01, /**< "logical block": first frame is #0 */
CDIO_CDROM_MSF = 0x02, /**< "minute-second-frame": binary, not
BCD here! */
CDIO_CDROM_DATA_TRACK = 0x04,
CDIO_CDROM_CDI_TRACK = 0x10,
CDIO_CDROM_XA_TRACK = 0x20
} cdio_track_enums;
/*! track modes (Table 350)
reference: MMC-3 draft revsion - 10g
*/
typedef enum {
AUDIO, /**< 2352 byte block length */
MODE1, /**< 2048 byte block length */
MODE1_RAW, /**< 2352 byte block length */
MODE2, /**< 2336 byte block length */
MODE2_FORM1, /**< 2048 byte block length */
MODE2_FORM2, /**< 2324 byte block length */
MODE2_FORM_MIX, /**< 2336 byte block length */
MODE2_RAW /**< 2352 byte block length */
} trackmode_t;
/*! CD-ROM address types (GNU/Linux e.g. cdrom_tocentry.cdte_format) */
#define CDIO_CDROM_LBA 0x01 /**< "logical block": first frame is #0 */
#define CDIO_CDROM_MSF 0x02 /**< "minute-second-frame": binary, not
BCD here! */
/*! CD-ROM track format types (GNU/Linux cdte_ctrl) */
#define CDIO_CDROM_DATA_TRACK 0x04
#define CDIO_CDROM_CDI_TRACK 0x10
#define CDIO_CDROM_XA_TRACK 0x20
/*! CD-ROM address types (GNU/Linux e.g. cdrom_tocentry.cdte_format) */
#define CDIO_CDROM_LBA 0x01 /**< "logical block": first frame is #0 */
#define CDIO_CDROM_MSF 0x02 /**< "minute-second-frame": binary, not
BCD here! */
/*!
Get CD-Text information for a CdIo_t object.

5
lib/driver/sector.c
View File

@@ -1,5 +1,5 @@
/*
$Id: sector.c,v 1.4 2005/02/05 14:42:28 rocky Exp $
$Id: sector.c,v 1.5 2005/02/06 04:20:25 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
@@ -35,7 +35,7 @@
#include <ctype.h>
static const char _rcsid[] = "$Id: sector.c,v 1.4 2005/02/05 14:42:28 rocky Exp $";
static const char _rcsid[] = "$Id: sector.c,v 1.5 2005/02/06 04:20:25 rocky Exp $";
/*! String of bytes used to identify the beginning of a Mode 1 or
Mode 2 sector. */
@@ -44,7 +44,6 @@ const uint8_t CDIO_SECTOR_SYNC_HEADER[CDIO_CD_SYNC_SIZE] =
/* Variables to hold debugger-helping enumerations */
enum cdio_cd_enums;
enum cdio_cdrom_enums;
enum m2_sector_enums;
lba_t

5
lib/driver/track.c
View File

@@ -1,5 +1,5 @@
/*
$Id: track.c,v 1.3 2005/01/09 16:07:46 rocky Exp $
$Id: track.c,v 1.4 2005/02/06 04:20:25 rocky Exp $
Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
@@ -33,6 +33,9 @@ const char *track_format2str[6] =
"audio", "CD-i", "XA", "data", "PSX", "error"
};
/* Variables to hold debugger-helping enumerations */
enum cdio_track_enums;
/*!
Return the number of the first track.
CDIO_INVALID_TRACK is returned on error.