#include <cdio/mmc.h>
#endif
-#include "vlc_meta.h"
-#include "codecs.h"
+#include <vlc_meta.h>
+#include <vlc_codecs.h>
#ifdef HAVE_LIBCDDB
#include <cddb/cddb.h>
#include <cdio/paranoia.h>
#else
#define CdIo_t CdIo
-#endif
-
-#if LIBCDIO_VERSION_NUM < 78
-typedef enum {
- PARANOIA_MODE_DISABLE = 0x00, /* Note: We make use of 0 as being the same as false */
- PARANOIA_MODE_OVERLAP = 0x04,
- PARANOIA_MODE_FULL = 0xff
-} paranoia_mode_t;
#endif
-
+
/*****************************************************************************
* cdda_data_t: CD audio information
*****************************************************************************/
track_t i_tracks; /* # of tracks */
track_t i_first_track; /* # of first track */
track_t i_titles; /* # of titles in playlist */
-
+
/* Current position */
track_t i_track; /* Current track */
lsn_t i_lsn; /* Current Logical Sector Number */
-
+
lsn_t first_frame; /* LSN of first frame of this track */
lsn_t last_frame; /* LSN of last frame of this track */
lsn_t last_disc_frame; /* LSN of last frame on CD */
char * psz_mcn; /* Media Catalog Number */
char * psz_source; /* CD drive or CD image filename */
input_title_t *p_title[CDIO_CD_MAX_TRACKS]; /* This *is* 0 origin, not
- track number origin */
+ track number origin */
#if LIBCDIO_VERSION_NUM >= 72
/* Paranoia support */
paranoia_mode_t e_paranoia; /* Use cd paranoia for reads? */
cdrom_drive_t *paranoia_cd; /* Place to store drive
- handle given by paranoia. */
+ handle given by paranoia. */
cdrom_paranoia_t *paranoia;
-#endif
-
+#endif
+
#ifdef HAVE_LIBCDDB
- vlc_bool_t b_cddb_enabled; /* Use CDDB at all? */
+ bool b_cddb_enabled; /* Use CDDB at all? */
struct {
- vlc_bool_t have_info; /* True if we have any info */
+ bool have_info; /* True if we have any info */
cddb_disc_t *disc; /* libcdio uses this to get disc
- info */
+ info */
int disc_length; /* Length in frames of cd. Used
- in CDDB lookups */
+ in CDDB lookups */
} cddb;
#endif
- vlc_bool_t b_audio_ctl; /* Use CD-Text audio controls and
- audio output? */
+ bool b_audio_ctl; /* Use CD-Text audio controls and
+ audio output? */
- vlc_bool_t b_cdtext; /* Use CD-Text at all? If not,
- cdtext_preferred is meaningless. */
- vlc_bool_t b_cdtext_prefer; /* Prefer CD-Text info over
- CDDB? If no CDDB, the issue
- is moot. */
+ bool b_cdtext; /* Use CD-Text at all? If not,
+ cdtext_preferred is meaningless. */
+ bool b_cdtext_prefer; /* Prefer CD-Text info over
+ CDDB? If no CDDB, the issue
+ is moot. */
- const cdtext_t *p_cdtext[CDIO_CD_MAX_TRACKS]; /* CD-Text info. Origin is NOT
- 0 origin but origin of track
- number (usually 1).
- */
+ const cdtext_t *p_cdtext[CDIO_CD_MAX_TRACKS]; /* CD-Text info. Origin is NOT
+ 0 origin but origin of track
+ number (usually 1).
+ */
WAVEHEADER waveheader; /* Wave header for the output data */
- vlc_bool_t b_header;
- vlc_bool_t b_nav_mode; /* If false we view the entire CD as
- as a unit rather than each track
- as a unit. If b_nav_mode then the
- slider area represents the Disc rather
- than a track
- */
-
+ bool b_header;
+ bool b_nav_mode; /* If false we view the entire CD as
+ as a unit rather than each track
+ as a unit. If b_nav_mode then the
+ slider area represents the Disc rather
+ than a track
+ */
+
input_thread_t *p_input;
-
+
} cdda_data_t;
/* FIXME: This variable is a hack. Would be nice to eliminate. */