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

Changes brought about by sector.h #define changes.

Browse Source
This commit is contained in:
rocky
2003-04-08 10:35:09 +00:00
parent d058b02d94
commit 6748f14c45
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/_cdio_bsdi.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: _cdio_bsdi.c,v 1.6 2003/04/06 17:57:20 rocky Exp $ $Id: _cdio_bsdi.c,v 1.7 2003/04/08 10:35:09 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_bsdi.c,v 1.6 2003/04/06 17:57:20 rocky Exp $"; static const char _rcsid[] = "$Id: _cdio_bsdi.c,v 1.7 2003/04/08 10:35:09 rocky Exp $";
#include "cdio_assert.h" #include "cdio_assert.h"
#include "cdio_private.h" #include "cdio_private.h"
@@ -155,7 +155,7 @@ _read_mode2_sector (void *user_data, void *data, lsn_t lsn,
if (mode2_form2) if (mode2_form2)
memcpy (data, buf, M2RAW_SECTOR_SIZE); memcpy (data, buf, M2RAW_SECTOR_SIZE);
else else
memcpy (((char *)data), buf + 8, FORM1_DATA_SIZE); memcpy (((char *)data), buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE);
return 0; return 0;
} }
@@ -184,8 +184,8 @@ _read_mode2_sectors (void *user_data, void *data, lsn_t lsn,
if ( (retval = _read_mode2_sector (_obj, buf, lsn + i, true)) ) if ( (retval = _read_mode2_sector (_obj, buf, lsn + i, true)) )
return retval; return retval;
memcpy (((char *)data) + (FORM1_DATA_SIZE * i), buf + 8, memcpy (((char *)data) + (CDIO_CD_FRAMESIZE * i),
FORM1_DATA_SIZE); buf + CDIO_CD_SUBHEADER_SIZE, CDIO_CD_FRAMESIZE);
} }
} }
return 0; return 0;
@@ -440,7 +440,7 @@ _cdio_get_track_green(void *user_data, track_t track_num)
if (!_obj->toc_init) _cdio_read_toc (_obj) ; if (!_obj->toc_init) _cdio_read_toc (_obj) ;
if (track_num == CDIO_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1; if (track_num == CDIO_CDROM_LEADOUT_TRACK) 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;
@@ -467,7 +467,7 @@ _cdio_get_track_msf(void *user_data, track_t track_num, msf_t *msf)
if (!_obj->toc_init) _cdio_read_toc (_obj) ; if (!_obj->toc_init) _cdio_read_toc (_obj) ;
if (track_num == CDIO_LEADOUT_TRACK) track_num = TOTAL_TRACKS+1; if (track_num == CDIO_CDROM_LEADOUT_TRACK) 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;