First attempt to reinstate a libcdio cdda.

vlc_meta.h: added CD-Text, ISO 9660, and CDDB fields. Separate email
will be sent about this.

Note: sound may be off by 2 seconds (150 sectors or pregap
amount). The sound for both this and the other cdda plugin don't work
for me. Before the last SVN update though that's what it sounded like.

configure.ac

@@ -1486,46 +1486,46 @@ then
   VLC_ADD_PLUGINS([pvr])
 fi
 
-dnl dnl
-dnl dnl  VCDX and CDDAX modules
-dnl dnl
-dnl AC_ARG_ENABLE(libcdio,
-dnl   [  --enable-libcdio        CDDA support via libcdio (default enabled)])
-dnl 
-dnl AC_ARG_ENABLE(libcddb,
-dnl   [  --enable-libcddb        CDDB support for CDDAX (default enabled)])
-dnl 
+dnl
+dnl  VCDX and CDDAX modules
+dnl
+AC_ARG_ENABLE(libcdio,
+  [  --enable-libcdio        CDDA support via libcdio (default enabled)])
+ 
+AC_ARG_ENABLE(libcddb,
+  [  --enable-libcddb        CDDB support for CDDAX (default enabled)])
+ 
 dnl AC_ARG_ENABLE(vcdx,
 dnl   [  --enable-vcdx           VCD support with Navigation (default enabled)])
-dnl 
-dnl AC_ARG_ENABLE(cdda,           
-dnl   [  --enable-cdda           CDDA plugin support (default enabled)])
-dnl 
-dnl AC_ARG_ENABLE(cddax,
-dnl   [  --enable-cddax          CDDAX plugin support (default enabled)])
-dnl 
-dnl if test "${enable_cddax}" != "no"
-dnl then
-dnl   PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.65,
-dnl    [enable_cddax="no"
-dnl     AC_DEFINE(HAVE_CDDAX, [], [Define for the CD-DA plugin using libcdio])
-dnl     VLC_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS])
-dnl     VLC_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS])
-dnl     VLC_ADD_PLUGINS([cddax])], 
-dnl    [AC_MSG_WARN(libcdio library not found)
-dnl    HAVE_CDDAX=no])
-dnl 
-dnl   if test "$enable_libcddb" != "no"; then
-dnl     PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.4, [
-dnl       HAVE_LIBCDDB=yes 
-dnl       AC_DEFINE(HAVE_LIBCDDB, [], [Define this if you have libcddb installed])
-dnl       VLC_ADD_LDFLAGS([cddax],[$LIBCDDB_LIBS])
-dnl       VLC_ADD_CFLAGS([cddax],[$LIBCDDB_CFLAGS])
-dnl       ],
-dnl       [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled) 
-dnl       HAVE_LIBCDDB=no])
-dnl   fi
-dnl 
+ 
+AC_ARG_ENABLE(cdda,           
+  [  --enable-cdda           CDDA plugin support (default enabled)])
+ 
+AC_ARG_ENABLE(cddax,
+  [  --enable-cddax          CDDAX plugin support (default enabled)])
+ 
+if test "${enable_cddax}" != "no"
+then
+  PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.70,
+   [enable_cddax="no"
+    AC_DEFINE(HAVE_CDDAX, [], [Define for the CD-DA plugin using libcdio])
+    VLC_ADD_LDFLAGS([cddax],[$LIBCDIO_LIBS])
+    VLC_ADD_CFLAGS([cddax],[$LIBCDIO_CFLAGS])
+    VLC_ADD_PLUGINS([cddax])], 
+    [AC_MSG_WARN(libcdio library not found)
+    HAVE_CDDAX=no])
+
+  if test "$enable_libcddb" != "no"; then
+    PKG_CHECK_MODULES(LIBCDDB, libcddb >= 0.9.4, [
+      HAVE_LIBCDDB=yes 
+      AC_DEFINE(HAVE_LIBCDDB, [], [Define this if you have libcddb installed])
+      VLC_ADD_LDFLAGS([cddax],[$LIBCDDB_LIBS])
+      VLC_ADD_CFLAGS([cddax],[$LIBCDDB_CFLAGS])
+      ],
+      [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled) 
+      HAVE_LIBCDDB=no])
+  fi
+ 
 dnl   if test "${enable_vcdx}" != "no"
 dnl   then
 dnl     PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.20,
@@ -1538,7 +1538,7 @@ dnl       VLC_ADD_PLUGINS([vcdx])],
 dnl      [AC_MSG_WARN(vcdinfo library not found)
 dnl      HAVE_VCDX=no])
 dnl   fi
-dnl fi
+fi
 
 dnl
 dnl  VCD module

include/vlc_meta.h

@@ -36,6 +36,30 @@
 #define VLC_META_SETTING            N_("Setting")
 #define VLC_META_URL                N_("URL")
 #define VLC_META_LANGUAGE           N_("Language")
+
+#define VLC_META_CDDB_ARTIST        N_("CDDB Artist")
+#define VLC_META_CDDB_CATEGORY      N_("CDDB Category")  
+#define VLC_META_CDDB_DISCID        N_("CDDB Disc ID")
+#define VLC_META_CDDB_EXT_DATA      N_("CDDB Extended Data")
+#define VLC_META_CDDB_GENRE         N_("CDDB Genre")
+#define VLC_META_CDDB_YEAR          N_("CDDB Year")      
+#define VLC_META_CDDB_TITLE         N_("CDDB Title")
+
+#define VLC_META_CDTEXT_ARRANGER    N_("CD-Text Arranger")
+#define VLC_META_CDTEXT_COMPOSER    N_("CD-Text Composer")
+#define VLC_META_CDTEXT_DISCID      N_("CD-Text Disc ID")
+#define VLC_META_CDTEXT_GENRE       N_("CD-Text Genre")
+#define VLC_META_CDTEXT_MESSAGE     N_("CD-Text Message")
+#define VLC_META_CDTEXT_SONGWRITER  N_("CD-Text Songwriter")
+#define VLC_META_CDTEXT_PERFORMER   N_("CD-Text Performer")
+#define VLC_META_CDTEXT_TITLE       N_("CD-Text Title")
+
+#define VLC_META_ISO_APPLICATION_ID N_("ISO-9660 Application ID") 
+#define VLC_META_ISO_PREPARER       N_("ISO-9660 Preparer") 
+#define VLC_META_ISO_PUBLISHER      N_("ISO-9660 Publisher") 
+#define VLC_META_ISO_VOLUME         N_("ISO-9660 Volume") 
+#define VLC_META_ISO_VOLUMESET      N_("ISO-9660 Volume Set") 
+
 #define VLC_META_CODEC_NAME         N_("Codec Name")
 #define VLC_META_CODEC_DESCRIPTION  N_("Codec Description")
 

modules/access/cdda/cdda.c

@@ -32,13 +32,10 @@
 /*****************************************************************************
  * prototypes
  *****************************************************************************/
-int  E_(Open)         ( vlc_object_t * );
-void E_(Close)        ( vlc_object_t * );
+int  E_(CDDAOpen)     ( vlc_object_t * );
+void E_(CDDAClose)    ( vlc_object_t * );
 
-int  E_(OpenIntf)     ( vlc_object_t * );
-void E_(CloseIntf)    ( vlc_object_t * );
-
-int  E_(DebugCB)      ( vlc_object_t *p_this, const char *psz_name,
+int  E_(CDDADebugCB)  ( vlc_object_t *p_this, const char *psz_name,
                         vlc_value_t oldval, vlc_value_t val,
                         void *p_data );
 
@@ -104,15 +101,15 @@ int  E_(CDDBEnabledCB)( vlc_object_t *p_this, const char *psz_name,
  *****************************************************************************/
 
 vlc_module_begin();
-    add_usage_hint( N_("cddax://[device-or-file][@[T]num]") );
+    add_usage_hint( N_("cddax://[device-or-file][@[T]track]") );
     set_description( _("Compact Disc Digital Audio (CD-DA) input") );
-    set_capability( "access", 75 /* slightly higher than cdda */ );
-    set_callbacks( E_(Open), E_(Close) );
-    add_shortcut( "cdda" );
+    set_capability( "access2", 10 /* slightly higher than cdda */ );
+    set_callbacks( E_(CDDAOpen), E_(CDDAClose) );
     add_shortcut( "cddax" );
+    add_shortcut( "cd" );
 
     /* Configuration options */
-    add_integer ( MODULE_STRING "-debug", 0, E_(DebugCB),
+    add_integer ( MODULE_STRING "-debug", 0, E_(CDDADebugCB),
                   N_("If nonzero, this gives additional debug information."),
                   DEBUG_LONGTEXT, VLC_TRUE );
 

modules/access/cdda/cdda.h

@@ -3,7 +3,7 @@
  *          using libcdio, libvcd and libvcdinfo
  *****************************************************************************
  * Copyright (C) 2003 VideoLAN
- * $Id: cdda.h,v 1.6 2004/02/14 17:25:39 gbazin Exp $
+ * $Id$
  *
  * Author: Rocky Bernstein <rocky@panix.com>
  *
@@ -23,6 +23,7 @@
  *****************************************************************************/
 
 #include "../vcdx/cdrom.h"
+#include "vlc_meta.h"
 
 #ifdef HAVE_LIBCDDB
 #include <cddb/cddb.h>
@@ -45,7 +46,7 @@
 #if INPUT_DEBUG
 #define dbg_print(mask, s, args...) \
    if (p_cdda->i_debug & mask) \
-     msg_Dbg(p_input, "%s: "s, __func__ , ##args)
+     msg_Dbg(p_access, "%s: "s, __func__ , ##args)
 #else
 #define dbg_print(mask, s, args...)
 #endif
@@ -55,15 +56,20 @@
  *****************************************************************************/
 typedef struct cdda_data_s
 {
-    cddev_t     *p_cddev;                           /* CD device descriptor */
-    int         i_nb_tracks;                        /* Nb of tracks (titles) */
-    int         i_track;                                    /* Current track */
-    lsn_t       i_sector;                                  /* Current Sector */
-    lsn_t *     p_sectors;                                  /* Track sectors */
-    vlc_bool_t  b_end_of_track;           /* If the end of track was reached */
+    cddev_t     *p_cddev;                 /* CD device descriptor */
+    int         i_tracks;                 /* # of tracks (titles) */
+
+    /* Current position */
+    int         i_track;                  /* Current track */
+    lsn_t       i_sector;                 /* Current Sector */
+    lsn_t *     p_sectors;                /* Track sectors */
+
     int         i_debug;                  /* Debugging mask */
-    char *      mcn;                      /* Media Catalog Number            */
-    intf_thread_t *p_intf;
+    char *      psz_mcn;                  /* Media Catalog Number            */
+    vlc_meta_t  *p_meta;
+
+    input_title_t *p_title[CDIO_CD_MAX_TRACKS]; 
+
 
 #ifdef HAVE_LIBCDDB
     int         i_cddb_enabled;
@@ -76,7 +82,7 @@ typedef struct cdda_data_s
 #endif
 
     WAVEHEADER  waveheader;               /* Wave header for the output data */
-    int         i_header_pos;
+    vlc_bool_t  b_header;
 
 } cdda_data_t;