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

libcdio_cdda.pc.in: had wrong cdda_interface library

Browse Source 
Rename paranoia routines to cdio-specific names so both libraries can
coexist.  And I think it makes debugging a little easier if not
clearer.
This commit is contained in:
rocky
2005-01-25 11:04:45 +00:00
parent b29210bd3f
commit 266cb9a65d
9 changed files with 92 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@@ -19,7 +19,7 @@ define(RELEASE_NUM, 72)
define(CDIO_VERSION_STR, 0.$1cvs) define(CDIO_VERSION_STR, 0.$1cvs)
AC_PREREQ(2.52) AC_PREREQ(2.52)
AC_REVISION([$Id: configure.ac,v 1.129 2005/01/25 02:00:19 rocky Exp $])dnl AC_REVISION([$Id: configure.ac,v 1.130 2005/01/25 11:04:45 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)
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
@@ -527,12 +527,12 @@ AC_CONFIG_FILES([ \
lib/driver/Makefile \ lib/driver/Makefile \
lib/iso9660/Makefile \ lib/iso9660/Makefile \
lib/paranoia/Makefile \ lib/paranoia/Makefile \
libcdio.pc \
libcdio_cdda.pc \
libcdio_paranoia.pc \
libiso9660.pc \
package/libcdio-suse.spec \ package/libcdio-suse.spec \
package/libcdio.pc \
package/libcdio.spec \ package/libcdio.spec \
package/libcdio_cdda.pc \
package/libcdio_paranoia.pc \
package/libiso9660.pc \
src/cd-paranoia/Makefile \ src/cd-paranoia/Makefile \
src/cd-paranoia/usage.txt \ src/cd-paranoia/usage.txt \
src/cd-paranoia/doc/cd-paranoia.1 \ src/cd-paranoia/doc/cd-paranoia.1 \

8
example/paranoia2.c
View File

@@ -49,7 +49,7 @@ main(int argc, const char *argv[])
/* Found such a CD-ROM with a CD-DA loaded. Use the first drive in /* Found such a CD-ROM with a CD-DA loaded. Use the first drive in
the list. */ the list. */
p_cdio = cdio_open(*ppsz_cd_drives, DRIVER_UNKNOWN); p_cdio = cdio_open(*ppsz_cd_drives, DRIVER_UNKNOWN);
d=cdda_identify_cdio(p_cdio, 1, NULL); d=cdio_cddap_identify_cdio(p_cdio, 1, NULL);
} else { } else {
printf("Unable find or access a CD-ROM drive with an audio CD in it.\n"); printf("Unable find or access a CD-ROM drive with an audio CD in it.\n");
exit(1); exit(1);
@@ -60,9 +60,9 @@ main(int argc, const char *argv[])
free(ppsz_cd_drives); free(ppsz_cd_drives);
/* We'll set for verbose paranoia messages. */ /* We'll set for verbose paranoia messages. */
cdda_verbose_set(d, CDDA_MESSAGE_PRINTIT, CDDA_MESSAGE_PRINTIT); cdio_cddap_verbose_set(d, CDDA_MESSAGE_PRINTIT, CDDA_MESSAGE_PRINTIT);
if ( 0 != cdda_open(d) ) { if ( 0 != cdio_cddap_open(d) ) {
printf("Unable to open disc.\n"); printf("Unable to open disc.\n");
exit(1); exit(1);
} }
@@ -90,7 +90,7 @@ main(int argc, const char *argv[])
} }
} }
cdda_close(d); cdio_cddap_close(d);
exit(0); exit(0);
} }

50
include/cdio/cdda.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cdda.h,v 1.9 2005/01/22 18:11:32 rocky Exp $ $Id: cdda.h,v 1.10 2005/01/25 11:04:45 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 2001 Xiph.org Copyright (C) 2001 Xiph.org
@@ -148,13 +148,15 @@ struct cdrom_drive_s {
If mesagedest is 1, then any messages in the process will be stored If mesagedest is 1, then any messages in the process will be stored
in message. in message.
*/ */
extern cdrom_drive_t *cdda_find_a_cdrom(int messagedest, char **ppsz_message); extern cdrom_drive_t *cdio_cddap_find_a_cdrom(int messagedest,
char **ppsz_message);
/** Returns a paranoia CD-ROM drive object with a CD-DA in it. /** Returns a paranoia CD-ROM drive object with a CD-DA in it.
@see cdda_identify_cdio @see cdda_identify_cdio
*/ */
extern cdrom_drive_t *cdda_identify(const char *psz_device, int messagedest, extern cdrom_drive_t *cdio_cddap_identify(const char *psz_device,
char **ppsz_message); int messagedest,
char **ppsz_message);
/** Returns a paranoia CD-ROM drive ojbect with a CD-DA in it. /** Returns a paranoia CD-ROM drive ojbect with a CD-DA in it.
In contrast to cdda_identify, we start out with an initialzed p_cdio In contrast to cdda_identify, we start out with an initialzed p_cdio
@@ -162,25 +164,25 @@ extern cdrom_drive_t *cdda_identify(const char *psz_device, int messagedest,
as to get CDDB/CD-Text information. as to get CDDB/CD-Text information.
@see cdda_identify @see cdda_identify
*/ */
cdrom_drive_t *cdda_identify_cdio(CdIo_t *p_cdio, cdrom_drive_t *cdio_cddap_identify_cdio(CdIo_t *p_cdio,
int messagedest, char **ppsz_messages); int messagedest, char **ppsz_messages);
/** Obsolete interface. Don't use. @see cdda_identify */ /** Obsolete interface. Don't use. @see cdda_identify */
extern cdrom_drive_t *cdda_identify_cooked(const char *ppsz_device, extern cdrom_drive_t *cdio_cddap_identify_cooked(const char *ppsz_device,
int messagedest, int messagedest,
char **ppsz_message); char **ppsz_message);
/** drive-oriented functions */ /** drive-oriented functions */
extern int cdda_speed_set(cdrom_drive_t *d, int speed); extern int cdio_cddap_speed_set(cdrom_drive_t *d, int speed);
extern void cdda_verbose_set(cdrom_drive_t *d, int err_action, extern void cdio_cddap_verbose_set(cdrom_drive_t *d, int err_action,
int mes_action); int mes_action);
extern char *cdda_messages(cdrom_drive_t *d); extern char *cdio_cddap_messages(cdrom_drive_t *d);
extern char *cdda_errors(cdrom_drive_t *d); extern char *cdio_cddap_errors(cdrom_drive_t *d);
extern int cdda_close(cdrom_drive_t *d); extern int cdio_cddap_close(cdrom_drive_t *d);
extern int cdda_open(cdrom_drive_t *d); extern int cdio_cddap_open(cdrom_drive_t *d);
extern long cdda_read(cdrom_drive_t *d, void *p_buffer, extern long cdio_cddap_read(cdrom_drive_t *d, void *p_buffer,
lsn_t beginsector, long sectors); lsn_t beginsector, long sectors);
/*! Return the lsn for the start of track i_track */ /*! Return the lsn for the start of track i_track */
extern lsn_t cdda_track_firstsector(cdrom_drive_t *d, track_t i_track); extern lsn_t cdda_track_firstsector(cdrom_drive_t *d, track_t i_track);
@@ -298,5 +300,17 @@ const char *strerror_tr[]={
403: No audio tracks on disc 403: No audio tracks on disc
*/ */
/** For compatibility with good ol' paranoia */
#define cdda_cddap_find_a_cdrom cdio_cddap_find_a_cdrom
#define cdda_identify cdio_cddap_identify
#define cdda_speed_set cdio_cddap_speed_set
#define cdda_verbose_set cdio_cddap_verbose_set
#define cdda_messages cdio_cddap_messages
#define cdda_errors cdio_cddap_errors
#define cdda_close cdio_cddap_close
#define cdda_open cdio_cddap_open
#define cdda_read cdio_cddap_read
#endif /*_CDDA_INTERFACE_H_*/ #endif /*_CDDA_INTERFACE_H_*/

40
include/cdio/paranoia.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: paranoia.h,v 1.4 2005/01/20 04:51:14 rocky Exp $ $Id: paranoia.h,v 1.5 2005/01/25 11:04:45 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1998 Monty xiphmont@mit.edu Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -82,20 +82,20 @@ extern "C" {
@return new cdrom_paranoia object Call paranoia_free() when you are @return new cdrom_paranoia object Call paranoia_free() when you are
done with it done with it
*/ */
extern cdrom_paranoia_t *paranoia_init(cdrom_drive_t *d); extern cdrom_paranoia_t *cdio_paranoia_init(cdrom_drive_t *d);
/*! /*!
Free any resources associated with obj. Free any resources associated with obj.
@see paranoia_init. @see paranoia_init.
*/ */
extern void paranoia_free(cdrom_paranoia_t *p); extern void cdio_paranoia_free(cdrom_paranoia_t *p);
/*! /*!
Set the kind of repair you want to on for reading. Set the kind of repair you want to on for reading.
The modes are listed above The modes are listed above
*/ */
extern void paranoia_modeset(cdrom_paranoia_t *p, int mode); extern void cdio_paranoia_modeset(cdrom_paranoia_t *p, int mode);
/*! /*!
reposition reading offset. reposition reading offset.
@@ -105,30 +105,40 @@ extern void paranoia_modeset(cdrom_paranoia_t *p, int mode);
@param whence like corresponding parameter in libc's lseek, e.g. @param whence like corresponding parameter in libc's lseek, e.g.
SEEK_SET or SEEK_END. SEEK_SET or SEEK_END.
*/ */
extern lsn_t paranoia_seek(cdrom_paranoia_t *p, off_t seek, int whence); extern lsn_t cdio_paranoia_seek(cdrom_paranoia_t *p, off_t seek, int whence);
/*! @return the audio data read CDIO_CD_FRAMESIZE_RAW bytes. This data /*! @return the audio data read CDIO_CD_FRAMESIZE_RAW bytes. This data
is not freed by the caller, but will persist only until the next is not freed by the caller, but will persist only until the next
call. call.
*/ */
extern int16_t *paranoia_read(cdrom_paranoia_t *p, extern int16_t *cdio_paranoia_read(cdrom_paranoia_t *p,
void(*callback)(long int, paranoia_cb_mode_t)); void(*callback)(long int, paranoia_cb_mode_t));
/*! The same as paranoia_read but the number of retries is set. /*! The same as cdio_paranoia_read but the number of retries is set.
@param maxretries number of times to try re-reading a block before @param maxretries number of times to try re-reading a block before
failing. @see paranoia_read. failing. @see cdio_paranoia_read.
*/ */
extern int16_t *paranoia_read_limited(cdrom_paranoia_t *p, extern int16_t *cdio_paranoia_read_limited(cdrom_paranoia_t *p,
void(*callback)(long int, void(*callback)(long int,
paranoia_cb_mode_t), paranoia_cb_mode_t),
int maxretries); int maxretries);
extern void paranoia_overlapset(cdrom_paranoia_t *p,long overlap); extern void cdio_paranoia_overlapset(cdrom_paranoia_t *p,long overlap);
extern void paranoia_set_range(cdrom_paranoia_t *p, long int start, extern void cdio_paranoia_set_range(cdrom_paranoia_t *p, long int start,
long int end); long int end);
/** For compatibility with good ol' paranoia */
#define paranoia_init cdio_paranoia_init
#define paranoia_free cdio_paranoia_free
#define paranoia_modeset cdio_paranoia_modeset
#define paranoia_seek cdio_paranoia_seek
#define paranoia_read cdio_paranoia_read
#define paranoia_read_limited cdio_paranoia_read_limited
#define paranoia_overlapset cdio_paranoia_overlapset
#define paranoia_set_range cdio_paranoia_read_overlapset
#ifdef __cplusplus #ifdef __cplusplus
} }

5
lib/cdda_interface/cooked_interface.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cooked_interface.c,v 1.13 2005/01/22 18:11:32 rocky Exp $ $Id: cooked_interface.c,v 1.14 2005/01/25 11:04:45 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Original interface.c Copyright (C) 1994-1997 Original interface.c Copyright (C) 1994-1997
@@ -297,7 +297,8 @@ check_exceptions(cdrom_drive_t *d, const exception_t *list)
/* set function pointers to use the ioctl routines */ /* set function pointers to use the ioctl routines */
int int
cooked_init_drive (cdrom_drive_t *d){ cooked_init_drive (cdrom_drive_t *d)
{
int ret; int ret;
#if HAVE_LINUX_MAJOR_H #if HAVE_LINUX_MAJOR_H

20
lib/cdda_interface/interface.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: interface.c,v 1.15 2005/01/23 14:05:19 rocky Exp $ $Id: interface.c,v 1.16 2005/01/25 11:04:45 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1998 Monty xiphmont@mit.edu Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -43,7 +43,7 @@ static void _clean_messages(cdrom_drive_t *d)
/* doubles as "cdrom_drive_free()" */ /* doubles as "cdrom_drive_free()" */
int int
cdda_close(cdrom_drive_t *d) cdio_cddap_close(cdrom_drive_t *d)
{ {
if(d){ if(d){
if(d->opened) if(d->opened)
@@ -61,7 +61,7 @@ cdda_close(cdrom_drive_t *d)
/* finish initializing the drive! */ /* finish initializing the drive! */
int int
cdda_open(cdrom_drive_t *d) cdio_cddap_open(cdrom_drive_t *d)
{ {
int ret; int ret;
if(d->opened)return(0); if(d->opened)return(0);
@@ -111,12 +111,14 @@ cdda_open(cdrom_drive_t *d)
} }
int int
cdda_speed_set(cdrom_drive_t *d, int speed) cdio_cddap_speed_set(cdrom_drive_t *d, int speed)
{ {
return d->set_speed ? d->set_speed(d, speed) : 0; return d->set_speed ? d->set_speed(d, speed) : 0;
} }
long cdda_read(cdrom_drive_t *d, void *buffer, lsn_t beginsector, long sectors) long
cdio_cddap_read(cdrom_drive_t *d, void *buffer, lsn_t beginsector,
long sectors)
{ {
if (d->opened) { if (d->opened) {
if (sectors>0) { if (sectors>0) {
@@ -152,20 +154,22 @@ long cdda_read(cdrom_drive_t *d, void *buffer, lsn_t beginsector, long sectors)
} }
void void
cdda_verbose_set(cdrom_drive_t *d,int err_action, int mes_action) cdio_cddap_verbose_set(cdrom_drive_t *d,int err_action, int mes_action)
{ {
d->messagedest=mes_action; d->messagedest=mes_action;
d->errordest=err_action; d->errordest=err_action;
} }
extern char *cdda_messages(cdrom_drive_t *d) extern char *
cdio_cddap_messages(cdrom_drive_t *d)
{ {
char *ret=d->messagebuf; char *ret=d->messagebuf;
d->messagebuf=NULL; d->messagebuf=NULL;
return(ret); return(ret);
} }
extern char *cdda_errors(cdrom_drive_t *d) extern char *
cdio_cddap_errors(cdrom_drive_t *d)
{ {
char *ret=d->errorbuf; char *ret=d->errorbuf;
d->errorbuf=NULL; d->errorbuf=NULL;

12
lib/cdda_interface/scan_devices.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: scan_devices.c,v 1.16 2005/01/23 05:31:03 rocky Exp $ $Id: scan_devices.c,v 1.17 2005/01/25 11:04:45 rocky Exp $
Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2004, 2005 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1998 Monty xiphmont@mit.edu Copyright (C) 1998 Monty xiphmont@mit.edu
@@ -77,7 +77,7 @@ cdda_identify_device_cdio(CdIo_t *p_cdio, const char *psz_device,
happens in interface.c */ happens in interface.c */
cdrom_drive_t * cdrom_drive_t *
cdda_find_a_cdrom(int messagedest, char **ppsz_messages){ cdio_cddap_find_a_cdrom(int messagedest, char **ppsz_messages){
/* Brute force... */ /* Brute force... */
int i=0; int i=0;
@@ -134,13 +134,13 @@ cdda_identify(const char *psz_device, int messagedest,char **ppsz_messages)
else else
idmessage(messagedest, ppsz_messages, "Checking for cdrom...", NULL ); idmessage(messagedest, ppsz_messages, "Checking for cdrom...", NULL );
d=cdda_identify_cooked(psz_device, messagedest, ppsz_messages); d=cdio_cddap_identify_cooked(psz_device, messagedest, ppsz_messages);
return(d); return(d);
} }
cdrom_drive_t * cdrom_drive_t *
cdda_identify_cdio(CdIo_t *p_cdio, int messagedest, char **ppsz_messages) cdio_cddap_identify_cdio(CdIo_t *p_cdio, int messagedest, char **ppsz_messages)
{ {
if (!p_cdio) return NULL; if (!p_cdio) return NULL;
{ {
@@ -298,8 +298,8 @@ cdda_identify_device_cdio(CdIo_t *p_cdio, const char *psz_device,
with such folks, perhaps this routine should be renamed. with such folks, perhaps this routine should be renamed.
*/ */
cdrom_drive_t * cdrom_drive_t *
cdda_identify_cooked(const char *psz_dev, int messagedest, cdio_cddap_identify_cooked(const char *psz_dev, int messagedest,
char **ppsz_messages) char **ppsz_messages)
{ {
CdIo_t *p_cdio = NULL; CdIo_t *p_cdio = NULL;

2
libcdio_cdda.pc.in
View File

@@ -7,5 +7,5 @@ Name: @PACKAGE_NAME@
Description: Portable CD-ROM I/O library Description: Portable CD-ROM I/O library
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
#Requires: glib-2.0 #Requires: glib-2.0
Libs: -L${libdir} -lcdda_interface Libs: -L${libdir} -lcdio_cdda
Cflags: -I${includedir} Cflags: -I${includedir}

8
test/testparanoia.c
View File

@@ -82,7 +82,7 @@ main(int argc, const char *argv[])
/* We'll set for verbose paranoia messages. */ /* We'll set for verbose paranoia messages. */
cdda_verbose_set(d, CDDA_MESSAGE_PRINTIT, CDDA_MESSAGE_PRINTIT); cdda_verbose_set(d, CDDA_MESSAGE_PRINTIT, CDDA_MESSAGE_PRINTIT);
if ( 0 != cdda_open(d) ) { if ( 0 != cdio_cddap_open(d) ) {
printf("Unable to open disc.\n"); printf("Unable to open disc.\n");
exit(SKIP_TEST_RC); exit(SKIP_TEST_RC);
} }
@@ -119,8 +119,8 @@ main(int argc, const char *argv[])
i++, i_lsn++ ) { i++, i_lsn++ ) {
/* read a sector */ /* read a sector */
int16_t *p_readbuf = paranoia_read(p, callback); int16_t *p_readbuf = paranoia_read(p, callback);
char *psz_err=cdda_errors(d); char *psz_err=cdio_cddap_errors(d);
char *psz_mes=cdda_messages(d); char *psz_mes=cdio_cddap_messages(d);
memcpy(audio_buf[i], p_readbuf, CDIO_CD_FRAMESIZE_RAW); memcpy(audio_buf[i], p_readbuf, CDIO_CD_FRAMESIZE_RAW);
@@ -179,7 +179,7 @@ main(int argc, const char *argv[])
out: paranoia_free(p); out: paranoia_free(p);
} }
cdda_close(d); cdio_cddap_close(d);
exit(i_rc); exit(i_rc);
} }