[xine-cvs] CVS: xine-vcdnav/input xineplug_inp_cd.c,1.46,1.47

[Rocky B. <ro...@us...>]

Update of /cvsroot/xine/xine-vcdnav/input
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1530/input

Modified Files:
	xineplug_inp_cd.c 
Log Message:
xineplug_inp_cd.c: Add some CD-Text support. But this needs...
configure.ac: libcdio 0.70cvs or better



Index: xineplug_inp_cd.c
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/input/xineplug_inp_cd.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- xineplug_inp_cd.c	7 Aug 2004 23:20:27 -0000	1.46
+++ xineplug_inp_cd.c	8 Aug 2004 02:18:57 -0000	1.47
@@ -68,6 +68,7 @@
 #include <cdio/cdio.h>
 #include <cdio/logging.h>
 #include <cdio/cd_types.h>
+#include <cdio/cdtext.h>
 
 #ifdef HAVE_LIBCDDB
 #include <cddb/cddb.h>
@@ -132,6 +133,11 @@
 					title when CDDB not enabled. */
   char         *comment_format;      /* Format string of stream comment 
 					meta when CDDB not enabled.*/
[...981 lines suppressed...]
+			  NULL, 0,
+			  cdtext_prefer_changed_cb, (void *) class);
+  
 #ifdef HAVE_LIBCDDB
-  class->cddb.enabled =
+  class->cddb.b_enabled =
     x_conf->register_bool(x_conf, "cdda.cddb_enabled", 1,
 			  _("Do we use CDDB to retrieve CD information?"), 
 			  NULL, 0,
@@ -1795,7 +1920,9 @@
 				   _("email given on cddb requests"), 
 				   (void *) class, 10, 
 				   cddb_email_changed_cb, (void *) class));
-#endif
+#else
+  this->class->cddb.b_enabled = false;
+#endif /* HAVE_LIBCDDB */
 
   class->v_config.title_format =
     strdup(x_conf->register_string(x_conf,