[patch] Modified patch file to fix some issues

230_all_libcdio-0.78.2.patch (text/plain), 3.62 KB, created by Andre Hinrichs on 2006-11-07 05:06:46 UTC

diff -ruN vlc-0.8.5-orig/modules/access/cdda/access.c vlc-0.8.5/modules/access/cdda/access.c
--- vlc-0.8.5-orig/modules/access/cdda/access.c	2006-05-06 17:52:18.000000000 +0200
+++ vlc-0.8.5/modules/access/cdda/access.c	2006-11-07 13:22:04.000000000 +0100
@@ -290,7 +290,7 @@
     }
     
     {
-#if LIBCDIO_VERSION_NUM >= 72
+#if LIBCDIO_VERSION_NUM >= 78
       driver_return_code_t rc = DRIVER_OP_SUCCESS;
 
       if ( p_cdda->e_paranoia && p_cdda->paranoia ) 
@@ -453,7 +453,7 @@
 
     p_cdda->i_lsn = (i_pos / CDIO_CD_FRAMESIZE_RAW);
 
-#if LIBCDIO_VERSION_NUM >= 72
+#if LIBCDIO_VERSION_NUM >= 78
     if ( p_cdda->e_paranoia && p_cdda->paranoia ) 
       cdio_paranoia_seek(p_cdda->paranoia, p_cdda->i_lsn, SEEK_SET);
 #endif
@@ -732,19 +732,19 @@
 
     CDDAFixupPlaylist( p_access, p_cdda, b_single_track );
 
-#if LIBCDIO_VERSION_NUM >= 72
+#if LIBCDIO_VERSION_NUM >= 78
     {
    
       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 @@
 	  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 @@
 	    /* 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
 				  );
@@ -844,7 +844,7 @@
     cdio_destroy( p_cdda->p_cdio );
     cdio_log_set_handler (uninit_log_handler);
 
-#if LIBCDIO_VERSION_NUM >= 72
+#if LIBCDIO_VERSION_NUM >= 78
     if (p_cdda->paranoia)
       cdio_paranoia_free(p_cdda->paranoia);
     if (p_cdda->paranoia_cd) 
diff -ruN vlc-0.8.5-orig/modules/access/cdda/cdda.h vlc-0.8.5/modules/access/cdda/cdda.h
--- vlc-0.8.5-orig/modules/access/cdda/cdda.h	2006-05-06 17:52:18.000000000 +0200
+++ vlc-0.8.5/modules/access/cdda/cdda.h	2006-11-07 12:45:10.000000000 +0100
@@ -71,12 +71,13 @@
 #define CdIo_t CdIo
 #endif    
 
+#if LIBCDIO_VERSION_NUM < 72
 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
@@ -105,7 +106,7 @@
   input_title_t *p_title[CDIO_CD_MAX_TRACKS]; /* This *is* 0 origin, not
 					         track number origin */
 
-#if LIBCDIO_VERSION_NUM >= 72
+#if LIBCDIO_VERSION_NUM >= 78
   /* Paranoia support */
   paranoia_mode_t e_paranoia;         /* Use cd paranoia for reads? */
   cdrom_drive_t *paranoia_cd;         /* Place to store drive