[vlc-devel] commit: Use libcdio namespace, and only if available ( Rafaël Carré )

[git version control]

vlc | branch: 0.8.6-bugfix | Rafaël Carré <funman at videolan.org> | Sun May 25 14:48:23 2008 +0200| [2444a87b34fe205b9ab01715047ebb9cef467e40]

Use libcdio namespace, and only if available

Manually picked from [f2fe0dac250da17373980dc531c31a2a0374380f]
[ae8638cbd8630e9370cbbb411e5d6141465fc42e]
and [4bacba8c7b69f54b3e4e0f575d11ce9b56971f39]

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2444a87b34fe205b9ab01715047ebb9cef467e40
---

 modules/access/cdda/access.c |   10 +++++-----
 modules/access/cdda/cdda.h   |    7 -------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/modules/access/cdda/access.c b/modules/access/cdda/access.c
index 52cef86..15b4b33 100644
--- a/modules/access/cdda/access.c
+++ b/modules/access/cdda/access.c
@@ -737,14 +737,14 @@ 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 ) {
@@ -755,7 +755,7 @@ CDDAOpen( vlc_object_t *p_this )
 	  if ( 0 != cdio_cddap_open(p_cdda->paranoia_cd) ) {
 	    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 {
 	    p_cdda->paranoia = cdio_paranoia_init(p_cdda->paranoia_cd);
 	    cdio_paranoia_seek(p_cdda->paranoia, p_cdda->i_lsn, SEEK_SET);
@@ -763,7 +763,7 @@ 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 ac2cc92..d6a5b78 100644
--- a/modules/access/cdda/cdda.h
+++ b/modules/access/cdda/cdda.h
@@ -71,13 +71,6 @@
 #define CdIo_t CdIo
 #endif    
 
-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_t;
-
-  
 /*****************************************************************************
  * cdda_data_t: CD audio information
  *****************************************************************************/