From f2fe0dac250da17373980dc531c31a2a0374380f Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Thu, 16 Nov 2006 23:54:55 +0000 Subject: [PATCH] * Forgot to commit the paranoia changes in the cddax module. see [17804] Patch by Patrick McLean --- modules/access/cdda/access.c | 10 +++++----- modules/access/cdda/cdda.h | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/modules/access/cdda/access.c b/modules/access/cdda/access.c index 4a8fddece3..54999a1f34 100644 --- a/modules/access/cdda/access.c +++ b/modules/access/cdda/access.c @@ -743,13 +743,13 @@ int CDDAOpen( vlc_object_t *p_this ) char *psz_paranoia = config_GetPsz( p_access, MODULE_STRING "-paranoia" ); - p_cdda->e_paranoia = paranoia_none; + p_cdda->e_paranoia = PARANOIA_MODE_DISABLE; if( psz_paranoia && *psz_paranoia ) { if( !strncmp( psz_paranoia, "full", strlen("full") ) ) - p_cdda->e_paranoia = paranoia_full; + p_cdda->e_paranoia = PARANOIA_MODE_FULL; else if( !strncmp(psz_paranoia, "overlap", strlen("overlap")) ) - p_cdda->e_paranoia = paranoia_overlap; + p_cdda->e_paranoia = PARANOIA_MODE_OVERLAP; /* Use CD Paranoia? */ if( p_cdda->e_paranoia ) @@ -764,7 +764,7 @@ int CDDAOpen( vlc_object_t *p_this ) { msg_Warn( p_cdda_input, "unable to get paranoia support - " "continuing without it." ); - p_cdda->e_paranoia = paranoia_none; + p_cdda->e_paranoia = PARANOIA_MODE_DISABLE; } else { @@ -775,7 +775,7 @@ int CDDAOpen( vlc_object_t *p_this ) /* Set reading mode for full or overlap paranoia, * but allow skipping sectors. */ cdio_paranoia_modeset( p_cdda->paranoia, - paranoia_full == p_cdda->e_paranoia ? + PARANOIA_MODE_FULL == p_cdda->e_paranoia ? PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP : PARANOIA_MODE_OVERLAP^PARANOIA_MODE_NEVERSKIP ); } diff --git a/modules/access/cdda/cdda.h b/modules/access/cdda/cdda.h index ac2cc923f6..b80e7f1bc0 100644 --- a/modules/access/cdda/cdda.h +++ b/modules/access/cdda/cdda.h @@ -71,12 +71,13 @@ #define CdIo_t CdIo #endif +#if LIBCDIO_VERSION_NUM < 78 typedef enum { - paranoia_none = 0, /* Note: We make use of 0 as being the same as false */ - paranoia_overlap = 1, - paranoia_full = 2 + 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 -- 2.39.2