1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
diff -ur 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 11:52:18.000000000 -0400
+++ vlc-0.8.5/modules/access/cdda/access.c 2006-11-03 17:00:54.000000000 -0500
@@ -737,14 +737,14 @@
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
);
diff -ur 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 11:52:18.000000000 -0400
+++ vlc-0.8.5/modules/access/cdda/cdda.h 2006-11-03 17:00:54.000000000 -0500
@@ -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
|
