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

Straighten out mode1 vs mode2 mess.

Browse Source
This commit is contained in:
rocky
2003-08-31 14:26:06 +00:00
parent c031e71702
commit 19c7de3990
8 changed files with 122 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/cdio/cdio.h
View File

@@ -1,5 +1,5 @@
/* -*- c -*-
$Id: cdio.h,v 1.16 2003/07/27 22:52:22 rocky Exp $
$Id: cdio.h,v 1.17 2003/08/31 14:26:06 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -222,20 +222,27 @@ extern "C" {
Reads a single mode1 sector from cd device into data starting
from lsn. Returns 0 if no error.
*/
int cdio_read_yellow_sector (CdIo *obj, void *buf, lsn_t lsn, bool mode1);
int cdio_read_mode1_sector (CdIo *obj, void *buf, lsn_t lsn, bool is_form2);
/*!
Reads nblocks of mode1 sectors from cd device into data starting
from lsn. Returns 0 if no error.
*/
int cdio_read_mode1_sectors (CdIo *obj, void *buf, lsn_t lsn, bool is_form2,
unsigned int num_sectors);
/*!
Reads a single mode2 sector from cd device into data starting
from lsn. Returns 0 if no error.
*/
int cdio_read_mode2_sector (CdIo *obj, void *buf, lsn_t lsn, bool mode2raw);
int cdio_read_mode2_sector (CdIo *obj, void *buf, lsn_t lsn, bool is_form2);
/*!
Reads nblocks of mode2 sectors from cd device into data starting
from lsn.
Returns 0 if no error.
*/
int cdio_read_mode2_sectors (CdIo *obj, void *buf, lsn_t lsn, bool mode2raw,
int cdio_read_mode2_sectors (CdIo *obj, void *buf, lsn_t lsn, bool is_form2,
unsigned int num_sectors);
/*!

7
include/cdio/iso9660.h
View File

@@ -1,5 +1,5 @@
/*
$Id: iso9660.h,v 1.12 2003/08/31 09:32:24 rocky Exp $
$Id: iso9660.h,v 1.13 2003/08/31 14:26:06 rocky Exp $
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -174,10 +174,11 @@ unsigned
iso9660_dir_calc_record_size (unsigned namelen, unsigned int su_len);
int
iso9660_fs_stat (CdIo *obj,const char pathname[], iso9660_stat_t *buf);
iso9660_fs_stat (CdIo *obj,const char pathname[], iso9660_stat_t *buf,
bool is_mode2);
void * /* list of char* -- caller must free it */
iso9660_fs_readdir (CdIo *obj, const char pathname[]);
iso9660_fs_readdir (CdIo *obj, const char pathname[], bool mode2);
uint8_t
iso9660_get_dir_len(const iso9660_dir_t *idr);

6
include/cdio/sector.h
View File

@@ -1,5 +1,5 @@
/*
$Id: sector.h,v 1.3 2003/05/26 03:11:06 rocky Exp $
$Id: sector.h,v 1.4 2003/08/31 14:26:06 rocky Exp $
Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -43,9 +43,9 @@
* format sector type user data size (bytes)
* -----------------------------------------------------------------------------
* 1 (Red Book) CD-DA 2352 (CDIO_CD_FRAMESIZE_RAW)
* 2 (Yellow Book) Mode1 Form1 2048 (M1F1_SECTOR_SIZE)
* 2 (Yellow Book) Mode1 Form1 2048 (CDIO_CD_FRAMESIZE)
* 3 (Yellow Book) Mode1 Form2 2336 (M2RAW_SECTOR_SIZE)
* 4 (Green Book) Mode2 Form1 2048 (M2F1_SECTOR_SIZE)
* 4 (Green Book) Mode2 Form1 2048 (CDIO_CD_FRAMESIZE)
* 5 (Green Book) Mode2 Form2 2328 (2324+4 spare bytes)
*
*