configure.ac: reinstate libcdio CD-DA and VCD plugins (on demand)

[vlc] / modules / access / cdda / cdda.c

diff --git a/modules/access/cdda/cdda.c b/modules/access/cdda/cdda.c
index 10bc239e9907b9f1f8d1f409190608c5c99e1f28..49851d1f757e9a3b9626f06d9e1e9e1d37d6aa66 100644 (file)
--- a/modules/access/cdda/cdda.c
+++ b/modules/access/cdda/cdda.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * cdda.c : CD digital audio input module for vlc using libcdio
  *****************************************************************************
- * Copyright (C) 2000, 2003, 2004 VideoLAN
+ * Copyright (C) 2000, 2003, 2004, 2005 VideoLAN
  * $Id$
  *
  * Authors: Rocky Bernstein <rocky@panix.com>
@@ -27,6 +27,7 @@
 
 #include "callback.h"
 #include "access.h"
+#include <cdio/version.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -131,7 +132,7 @@ vlc_module_begin();
                 N_("Format to use in playlist \"title\" field when using CDDB"),
                 CDDB_TITLE_FMT_LONGTEXT, VLC_TRUE );
 
-    add_bool( MODULE_STRING "-cddb-enabled", 1, CDDBEnabledCB,
+    add_bool( MODULE_STRING "-cddb-enabled", VLC_TRUE, CDDBEnabledCB,
               N_("Do CDDB lookups?"),
               N_("If set, lookup CD-DA track information using the CDDB "
                  "protocol"),
@@ -198,4 +199,14 @@ vlc_module_begin();
                 "a playlist entries"),
               VLC_FALSE );
 
+#if LIBCDIO_VERSION_NUM >= 72
+    add_bool( MODULE_STRING "-paranoia-enabled", 
+             //              VLC_FALSE, NULL,
+             VLC_TRUE, NULL,
+              N_("Enable CD paranoia?"),
+              N_("If set, CD-DA reading will go through paranoia "
+                 "jitter/error correction"),
+              VLC_FALSE );
+#endif    
+
 vlc_module_end();