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

handle DAO in nrg_read_audio_sectors

Browse Source
This commit is contained in:
edsdead
2008-03-20 08:07:44 +00:00
parent 08bbf64fd4
commit c0034ec8e1
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/driver/image/nrg.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: nrg.c,v 1.26 2008/03/20 01:40:29 edsdead Exp $ $Id: nrg.c,v 1.27 2008/03/20 08:07:44 edsdead Exp $
Copyright (C) 2003, 2004, 2005, 2006 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004, 2005, 2006 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org> Copyright (C) 2001, 2003 Herbert Valerio Riedel <hvr@gnu.org>
@@ -46,7 +46,7 @@
#include "_cdio_stdio.h" #include "_cdio_stdio.h"
#include "nrg.h" #include "nrg.h"
static const char _rcsid[] = "$Id: nrg.c,v 1.26 2008/03/20 01:40:29 edsdead Exp $"; static const char _rcsid[] = "$Id: nrg.c,v 1.27 2008/03/20 08:07:44 edsdead Exp $";
nero_id_t nero_id; nero_id_t nero_id;
nero_dtype_t nero_dtype; nero_dtype_t nero_dtype;
@@ -893,9 +893,22 @@ _read_audio_sectors_nrg (void *p_user_data, void *data, lsn_t lsn,
unsigned int nblocks) unsigned int nblocks)
{ {
_img_private_t *p_env = p_user_data; _img_private_t *p_env = p_user_data;
CdioListNode_t *node; CdioListNode_t *node;
if (p_env->is_dao) {
int ret;
ret = cdio_stream_seek (p_env->gen.data_source,
(lsn + CDIO_PREGAP_SECTORS) * CDIO_CD_FRAMESIZE_RAW, SEEK_SET);
if (ret!=0) return ret;
ret = cdio_stream_read (p_env->gen.data_source, data,
CDIO_CD_FRAMESIZE_RAW, nblocks);
/* ret is number of bytes if okay, but we need to return 0 okay. */
return ret == 0;
}
if (lsn >= p_env->size) if (lsn >= p_env->size)
{ {
cdio_warn ("trying to read beyond image size (%lu >= %lu)", cdio_warn ("trying to read beyond image size (%lu >= %lu)",