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

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) 2001 Xiph.org
@@ -148,13 +148,15 @@ struct cdrom_drive_s {
If mesagedest is 1, then any messages in the process will be stored
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.
@see cdda_identify_cdio
*/
extern cdrom_drive_t *cdda_identify(const char *psz_device, int messagedest,
char **ppsz_message);
extern cdrom_drive_t *cdio_cddap_identify(const char *psz_device,
int messagedest,
char **ppsz_message);
/** 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
@@ -162,25 +164,25 @@ extern cdrom_drive_t *cdda_identify(const char *psz_device, int messagedest,
as to get CDDB/CD-Text information.
@see cdda_identify
*/
cdrom_drive_t *cdda_identify_cdio(CdIo_t *p_cdio,
int messagedest, char **ppsz_messages);
cdrom_drive_t *cdio_cddap_identify_cdio(CdIo_t *p_cdio,
int messagedest, char **ppsz_messages);
/** Obsolete interface. Don't use. @see cdda_identify */
extern cdrom_drive_t *cdda_identify_cooked(const char *ppsz_device,
int messagedest,
char **ppsz_message);
extern cdrom_drive_t *cdio_cddap_identify_cooked(const char *ppsz_device,
int messagedest,
char **ppsz_message);
/** drive-oriented functions */
extern int cdda_speed_set(cdrom_drive_t *d, int speed);
extern void cdda_verbose_set(cdrom_drive_t *d, int err_action,
int mes_action);
extern char *cdda_messages(cdrom_drive_t *d);
extern char *cdda_errors(cdrom_drive_t *d);
extern int cdio_cddap_speed_set(cdrom_drive_t *d, int speed);
extern void cdio_cddap_verbose_set(cdrom_drive_t *d, int err_action,
int mes_action);
extern char *cdio_cddap_messages(cdrom_drive_t *d);
extern char *cdio_cddap_errors(cdrom_drive_t *d);
extern int cdda_close(cdrom_drive_t *d);
extern int cdda_open(cdrom_drive_t *d);
extern long cdda_read(cdrom_drive_t *d, void *p_buffer,
lsn_t beginsector, long sectors);
extern int cdio_cddap_close(cdrom_drive_t *d);
extern int cdio_cddap_open(cdrom_drive_t *d);
extern long cdio_cddap_read(cdrom_drive_t *d, void *p_buffer,
lsn_t beginsector, long sectors);
/*! Return the lsn for the start of track 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
*/
/** 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_*/

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) 1998 Monty xiphmont@mit.edu
@@ -82,20 +82,20 @@ extern "C" {
@return new cdrom_paranoia object Call paranoia_free() when you are
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.
@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.
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.
@@ -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.
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
is not freed by the caller, but will persist only until the next
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));
/*! 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
failing. @see paranoia_read.
failing. @see cdio_paranoia_read.
*/
extern int16_t *paranoia_read_limited(cdrom_paranoia_t *p,
void(*callback)(long int,
paranoia_cb_mode_t),
int maxretries);
extern int16_t *cdio_paranoia_read_limited(cdrom_paranoia_t *p,
void(*callback)(long int,
paranoia_cb_mode_t),
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,
long int end);
extern void cdio_paranoia_set_range(cdrom_paranoia_t *p, long int start,
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
}