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

Move lower-level cdrom_drive_t from paranoia.h into cdda.h

Browse Source 
This may cause some incompatibilty in applications that did
#include <cdio/cdda.h> without #include <cdio/paranoia.h>

As of now it's okay to just #include <cdio/paranoia.h> or include both,
but #includ'ing only <cdio/cdda.h> will be a problem.
This commit is contained in:
rocky
2005-09-21 01:41:31 +00:00
parent 2a03988a3a
commit 2afad8d866
5 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
example/C++/paranoia.cpp
View File

@@ -24,7 +24,7 @@
# include "config.h" # include "config.h"
#endif #endif
#include <cdio/cdda.h> #include <cdio/paranoia.h>
#include <cdio/cd_types.h> #include <cdio/cd_types.h>
#include <stdio.h> #include <stdio.h>

2
example/paranoia.c
View File

@@ -24,7 +24,7 @@
# include "config.h" # include "config.h"
#endif #endif
#include <cdio/cdda.h> #include <cdio/paranoia.h>
#include <cdio/cd_types.h> #include <cdio/cd_types.h>
#include <stdio.h> #include <stdio.h>

13
include/cdio/cdda.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cdda.h,v 1.22 2005/08/27 14:25:58 rocky Exp $ $Id: cdda.h,v 1.23 2005/09/21 01:41:32 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
@@ -30,12 +30,19 @@
#define _CDDA_INTERFACE_H_ #define _CDDA_INTERFACE_H_
#include <cdio/cdio.h> #include <cdio/cdio.h>
#include <cdio/paranoia.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
/** cdrom_paranoia is an opaque structure which is used in all of the
library operations.
*/
typedef struct cdrom_paranoia_s cdrom_paranoia_t;
typedef struct cdrom_drive_s cdrom_drive_t;
/** For compatibility. cdrom_drive_t is depricated, use cdrom_drive_t instead. */
extern enum paranoia_cdda_enums { extern enum paranoia_cdda_enums {
CDDA_MESSAGE_FORGETIT = 0, CDDA_MESSAGE_FORGETIT = 0,
CDDA_MESSAGE_PRINTIT = 1, CDDA_MESSAGE_PRINTIT = 1,
@@ -377,6 +384,8 @@ const char *strerror_tr[]={
#define cdda_track_preemp cdio_cddap_track_preemp #define cdda_track_preemp cdio_cddap_track_preemp
#define cdda_disc_firstsector cdio_cddap_disc_firstsector #define cdda_disc_firstsector cdio_cddap_disc_firstsector
#define cdda_disc_lastsector cdio_cddap_disc_lastsector #define cdda_disc_lastsector cdio_cddap_disc_lastsector
#define cdrom_drive cdrom_drive_t
#endif /*DO_NOT_WANT_PARANOIA_COMPATIBILITY*/ #endif /*DO_NOT_WANT_PARANOIA_COMPATIBILITY*/
#ifdef __cplusplus #ifdef __cplusplus

14
include/cdio/paranoia.h
View File

@@ -1,5 +1,5 @@
/* /*
$Id: paranoia.h,v 1.8 2005/01/29 20:54:20 rocky Exp $ $Id: paranoia.h,v 1.9 2005/09/21 01:41:32 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
@@ -29,7 +29,7 @@
#ifndef _CDIO_PARANOIA_H_ #ifndef _CDIO_PARANOIA_H_
#define _CDIO_PARANOIA_H_ #define _CDIO_PARANOIA_H_
#include <cdio/cdio.h> #include <cdio/cdda.h>
/*! Paranoia likes to work with 16-bit numbers rather than /*! Paranoia likes to work with 16-bit numbers rather than
(possibly byte-swapped) bytes. So there are this many (possibly byte-swapped) bytes. So there are this many
@@ -49,16 +49,6 @@
#define PARANOIA_MODE_REPAIR 16 #define PARANOIA_MODE_REPAIR 16
#define PARANOIA_MODE_NEVERSKIP 32 #define PARANOIA_MODE_NEVERSKIP 32
/** cdrom_paranoia is an opaque structure which is used in all of the
library operations.
*/
typedef struct cdrom_paranoia_s cdrom_paranoia_t;
typedef struct cdrom_drive_s cdrom_drive_t;
/** For compatibility. cdrom_drive_t is depricated, use cdrom_drive_t instead. */
#define cdrom_drive cdrom_drive_t
typedef enum { typedef enum {
PARANOIA_CB_READ, PARANOIA_CB_READ,
PARANOIA_CB_VERIFY, PARANOIA_CB_VERIFY,

2
test/testparanoia.c
View File

@@ -22,7 +22,7 @@
# include "config.h" # include "config.h"
#endif #endif
#include <cdio/cdda.h> #include <cdio/paranoia.h>
#include <cdio/cd_types.h> #include <cdio/cd_types.h>
#include <stdio.h> #include <stdio.h>