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

Use new sector.h constants. More changes will no doubt follow.

Browse Source
This commit is contained in:
rocky
2003-04-06 06:45:13 +00:00
parent 9716c04725
commit fe31b5baa6
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/_cdio_linux.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_linux.c,v 1.4 2003/03/30 13:01:22 rocky Exp $ $Id: _cdio_linux.c,v 1.5 2003/04/06 06:45:13 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
# include "config.h" # include "config.h"
#endif #endif
static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.4 2003/03/30 13:01:22 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.5 2003/04/06 06:45:13 rocky Exp $";
#include "cdio_assert.h" #include "cdio_assert.h"
#include "cdio_private.h" #include "cdio_private.h"
@@ -574,7 +574,7 @@ _cdio_get_track_green(void *user_data, track_t track_num)
if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ; if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ;
if (track_num == CDIO_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1; if (track_num == CDROM_LEADOUT) track_num = TOTAL_TRACKS+1;
if (track_num > TOTAL_TRACKS+1 || track_num == 0) if (track_num > TOTAL_TRACKS+1 || track_num == 0)
return false; return false;
@@ -601,7 +601,7 @@ _cdio_get_track_msf(void *user_data, track_t track_num, msf_t *msf)
if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ; if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ;
if (track_num == CDIO_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1; if (track_num == CDROM_LEADOUT) track_num = TOTAL_TRACKS+1;
if (track_num > TOTAL_TRACKS+1 || track_num == 0) { if (track_num > TOTAL_TRACKS+1 || track_num == 0) {
return false; return false;

18
lib/_cdio_nrg.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_nrg.c,v 1.4 2003/03/30 13:01:22 rocky Exp $ $Id: _cdio_nrg.c,v 1.5 2003/04/06 06:45:13 rocky Exp $
Copyright (C) 2001,2003 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001,2003 Herbert Valerio Riedel <hvr@gnu.org>
@@ -38,7 +38,7 @@
#include "util.h" #include "util.h"
#include "_cdio_stdio.h" #include "_cdio_stdio.h"
static const char _rcsid[] = "$Id: _cdio_nrg.c,v 1.4 2003/03/30 13:01:22 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_nrg.c,v 1.5 2003/04/06 06:45:13 rocky Exp $";
/* structures used */ /* structures used */
@@ -304,8 +304,8 @@ PRAGMA_END_PACKED
lsn2 = UINT32_FROM_BE (_entries[idx + 1].lsn); lsn2 = UINT32_FROM_BE (_entries[idx + 1].lsn);
_register_mapping (_obj, lsn, lsn2 - lsn, _register_mapping (_obj, lsn, lsn2 - lsn,
(lsn+CDIO_PREGAP_SECTORS) * CD_RAW_SECTOR_SIZE, (lsn+CDIO_PREGAP_SECTORS) * CD_FRAMESIZE_RAW,
CD_RAW_SECTOR_SIZE); CD_FRAMESIZE_RAW);
} }
} }
break; break;
@@ -523,7 +523,7 @@ _cdio_lseek (void *user_data, off_t offset, int whence)
track_info_t *this_track=&(_obj->tocent[i]); track_info_t *this_track=&(_obj->tocent[i]);
switch (this_track->track_format) { switch (this_track->track_format) {
case TRACK_FORMAT_AUDIO: case TRACK_FORMAT_AUDIO:
user_datasize=CDDA_SECTOR_SIZE; user_datasize=CD_FRAMESIZE_RAW;
break; break;
case TRACK_FORMAT_CDI: case TRACK_FORMAT_CDI:
user_datasize=FORM1_DATA_SIZE; user_datasize=FORM1_DATA_SIZE;
@@ -532,7 +532,7 @@ _cdio_lseek (void *user_data, off_t offset, int whence)
user_datasize=FORM1_DATA_SIZE; user_datasize=FORM1_DATA_SIZE;
break; break;
default: default:
user_datasize=CD_RAW_SECTOR_SIZE; user_datasize=CD_FRAMESIZE_RAW;
cdio_warn ("track %d has unknown format %d", cdio_warn ("track %d has unknown format %d",
i+1, this_track->track_format); i+1, this_track->track_format);
} }
@@ -582,7 +582,7 @@ _cdio_stat_size (void *user_data)
_read_mode2_sector (void *user_data, void *data, lsn_t lsn, bool form2) _read_mode2_sector (void *user_data, void *data, lsn_t lsn, bool form2)
{ {
_img_private_t *_obj = user_data; _img_private_t *_obj = user_data;
char buf[CD_RAW_SECTOR_SIZE] = { 0, }; char buf[CD_FRAMESIZE_RAW] = { 0, };
CdioListNode *node; CdioListNode *node;
if (lsn >= _obj->size) if (lsn >= _obj->size)
@@ -600,7 +600,7 @@ _read_mode2_sector (void *user_data, void *data, lsn_t lsn, bool form2)
{ {
long img_offset = _map->img_offset; long img_offset = _map->img_offset;
int blocksize = _obj->sector_2336_flag int blocksize = _obj->sector_2336_flag
? M2RAW_SECTOR_SIZE : CD_RAW_SECTOR_SIZE; ? M2RAW_SECTOR_SIZE : CD_FRAMESIZE_RAW;
img_offset += (lsn - _map->start_lsn) * blocksize; img_offset += (lsn - _map->start_lsn) * blocksize;
@@ -772,7 +772,7 @@ _cdio_get_track_msf(void *user_data, track_t track_num, msf_t *msf)
if (NULL == msf) return 1; if (NULL == msf) return 1;
if (track_num == CDIO_LEADOUT_TRACK) track_num = _obj->total_tracks+1; if (track_num == CDROM_LEADOUT) track_num = _obj->total_tracks+1;
if (track_num <= _obj->total_tracks+1 && track_num != 0) { if (track_num <= _obj->total_tracks+1 && track_num != 0) {
*msf = _obj->tocent[track_num-1].start_msf; *msf = _obj->tocent[track_num-1].start_msf;

8
lib/_cdio_sunos.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_sunos.c,v 1.5 2003/03/30 13:01:22 rocky Exp $ $Id: _cdio_sunos.c,v 1.6 2003/04/06 06:45:13 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
@@ -31,7 +31,7 @@
#ifdef HAVE_SOLARIS_CDROM #ifdef HAVE_SOLARIS_CDROM
static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.5 2003/03/30 13:01:22 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_sunos.c,v 1.6 2003/04/06 06:45:13 rocky Exp $";
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -521,7 +521,7 @@ _cdio_get_track_green(void *user_data, track_t track_num)
if (!_obj->gen.init) _cdio_init(_obj); if (!_obj->gen.init) _cdio_init(_obj);
if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ; if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ;
if (track_num == CDIO_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1; if (track_num == CDROM_LEADOUT) track_num = TOTAL_TRACKS+1;
if (track_num > TOTAL_TRACKS+1 || track_num == 0) if (track_num > TOTAL_TRACKS+1 || track_num == 0)
return false; return false;
@@ -549,7 +549,7 @@ _cdio_get_track_msf(void *user_data, track_t track_num, msf_t *msf)
if (!_obj->gen.init) _cdio_init(_obj); if (!_obj->gen.init) _cdio_init(_obj);
if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ; if (!_obj->gen.toc_init) _cdio_read_toc (_obj) ;
if (track_num == CDIO_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1; if (track_num == CDROM_LEADOUT) track_num = TOTAL_TRACKS+1;
if (track_num > TOTAL_TRACKS+1 || track_num == 0) { if (track_num > TOTAL_TRACKS+1 || track_num == 0) {
return false; return false;

5
lib/cdio.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cdio.h,v 1.6 2003/04/04 00:41:10 rocky Exp $ $Id: cdio.h,v 1.7 2003/04/06 06:45:13 rocky Exp $
Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
Copyright (C) 2003 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -83,6 +83,9 @@ extern "C" {
TRACK_FORMAT_CDI, /* CD-i. How this is different from DATA below? */ TRACK_FORMAT_CDI, /* CD-i. How this is different from DATA below? */
TRACK_FORMAT_XA, /* Mode2 of some sort */ TRACK_FORMAT_XA, /* Mode2 of some sort */
TRACK_FORMAT_DATA, /* Mode1 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; } track_format_t;