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

libcdio cdparanoia doing the wrong thing on a single-sector read. Savannah patch #5999.

Browse Source
This commit is contained in:
rocky
2007-10-16 15:32:02 +00:00
parent 40c531fed9
commit 4759107d7c
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -19,7 +19,7 @@ define(RELEASE_NUM, 79cvs)
define(CDIO_VERSION_STR, 0.$1) define(CDIO_VERSION_STR, 0.$1)
AC_PREREQ(2.52) AC_PREREQ(2.52)
AC_REVISION([$Id: configure.ac,v 1.213 2007/10/15 04:53:59 rocky Exp $])dnl AC_REVISION([$Id: configure.ac,v 1.214 2007/10/16 15:32:02 rocky Exp $])dnl
AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM)) AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
AC_CONFIG_SRCDIR(src/cd-info.c) AC_CONFIG_SRCDIR(src/cd-info.c)
@@ -696,7 +696,7 @@ cat > include/cdio/cdio_config.h << EOF
version of config.h version of config.h
*/ */
EOF EOF
head -n 202 config.h >> include/cdio/cdio_config.h head -n 230 config.h >> include/cdio/cdio_config.h
]],[[]]) ]],[[]])
AC_OUTPUT AC_OUTPUT

7
lib/cdda_interface/cddap_interface.c
View File

@@ -1,7 +1,7 @@
/* /*
$Id: cddap_interface.c,v 1.5 2006/03/18 18:37:56 rocky Exp $ $Id: cddap_interface.c,v 1.6 2007/10/16 15:32:02 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005, 2007 Rocky Bernstein <rocky@gnu.org>
Original interface.c Copyright (C) 1994-1997 Original interface.c Copyright (C) 1994-1997
Eissfeldt heiko@colossus.escape.de Eissfeldt heiko@colossus.escape.de
Current blenderization Copyright (C) 1998-1999 Monty xiphmont@mit.edu Current blenderization Copyright (C) 1998-1999 Monty xiphmont@mit.edu
@@ -95,7 +95,7 @@ read_blocks (cdrom_drive_t *d, void *p, lsn_t begin, long i_sectors)
do { do {
err = cdio_read_audio_sectors( d->p_cdio, buffer, begin, i_sectors); err = cdio_read_audio_sectors( d->p_cdio, buffer, begin, i_sectors);
if ( 0 != err ) { if ( DRIVER_OP_SUCCESS != err ) {
if (!d->error_retry) return -7; if (!d->error_retry) return -7;
if (i_sectors==1) { if (i_sectors==1) {
@@ -110,7 +110,6 @@ read_blocks (cdrom_drive_t *d, void *p, lsn_t begin, long i_sectors)
cderror(d, b); cderror(d, b);
return -10; return -10;
} }
break;
} }
if(retry_count>4) if(retry_count>4)