[xine-cvs] CVS: xine-lib/src/audio_out audio_oss_out.c,1.88,1.89

[James Courtier-Dutton <jcdutton@us...>]

Update of /cvsroot/xine/xine-lib/src/audio_out
In directory sc8-pr-cvs1:/tmp/cvs-serv26361/xine-lib/src/audio_out

Modified Files:
	audio_oss_out.c 
Log Message:
Work around for users with an oss sound card with spdif, but the sound
card incorrectly reports AFMT_AC3 as being absent.
In effect, this forces xine to send non-audio AC3 and DTS data to the sound card,
without ever knowing if the spdif is working or not.
Can cause horrible noise to come out of speakers, and might even damage speakers.



Index: audio_oss_out.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/audio_out/audio_oss_out.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- audio_oss_out.c	27 Mar 2003 11:39:23 -0000	1.88
+++ audio_oss_out.c	1 Jun 2003 22:48:26 -0000	1.89
@@ -309,10 +309,18 @@
     break;
   case AO_CAP_MODE_A52:
   case AO_CAP_MODE_AC5:
+    tmp = bits;
+    ioctl(this->audio_fd,SNDCTL_DSP_SAMPLESIZE,&tmp);
+
+    tmp = this->input_sample_rate;
+    ioctl(this->audio_fd,SNDCTL_DSP_SPEED, &tmp);
+    tmp = 2;
+    ioctl(this->audio_fd, SNDCTL_DSP_CHANNELS, &tmp);
     tmp = AFMT_AC3;
     if (ioctl(this->audio_fd, SNDCTL_DSP_SETFMT, &tmp) < 0 || tmp != AFMT_AC3) {
-      printf("audio_oss_out: AC3 SNDCTL_DSP_SETFMT failed. %d\n",tmp);
-      return 0;
+      printf("audio_oss_out: AC3 SNDCTL_DSP_SETFMT failed. %d. Using alternative.\n",tmp);
+      tmp = AFMT_S16_LE;
+      ioctl(this->audio_fd, SNDCTL_DSP_SETFMT, &tmp);
     }
     break;
   }
@@ -923,9 +931,12 @@
   }
 
   ioctl(audio_fd,SNDCTL_DSP_GETFMTS,&caps);
-  if (caps & AFMT_AC3) {
+
+  if ((caps & AFMT_AC3) || config->register_bool (config, "audio.oss_pass_through_bug", 0,
+			       _("used to inform xine about what the sound card can do"),
+			       NULL, 0, NULL, NULL)) {
     if (config->register_bool (config, "audio.a52_pass_through", 0,
-			       _("Enable A52 / AC5 digital audio output via spdif"),
+			       _("used to inform xine about what the sound card can do"),
 			       NULL, 0, NULL, NULL)) {
       this->capabilities |= AO_CAP_MODE_A52;
       this->capabilities |= AO_CAP_MODE_AC5;

[xine-cvs] CVS: xine-vcdnav/input Makefile.am,1.10,1.11 xineplug_inp_cd.c,1.16,1.17

[Rocky Bernstein <rockyb@us...>]

Update of /cvsroot/xine/xine-vcdnav/input
In directory sc8-pr-cvs1:/tmp/cvs-serv8736/input

Modified Files:
	Makefile.am xineplug_inp_cd.c 
Log Message:
require libcddb 0.9.4
Can now set CDDB: 
 cachedir, 
 network timeout
 whether caching enabled.

cddb logging is supposed to go through plugin now.

There are probably some small bugs and tweaks necessary.



Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/input/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.am	6 May 2003 01:11:56 -0000	1.10
+++ Makefile.am	1 Jun 2003 21:58:32 -0000	1.11
@@ -12,7 +12,7 @@
 DEBUG_CFLAGS = \
    @DEBUG_CFLAGS@ $(XINE_CFLAGS) $(VCDX_CFLAGS) $(LIBVCD_CFLAGS) -I$(top_srcdir)/xine-extra
 
-CDDB_LIB=@CDDB_LIB@
+CDDB_LIBS=@CDDB_LIBS@
 
 if BUILD_VCD
 if BUILD_CDDA
@@ -42,7 +42,7 @@
 
 xineplug_inp_cdx_la_LDFLAGS = -avoid-version -module
 
-xineplug_inp_cdx_la_LIBADD = ../xine-extra/xine-extra.@...@ $(CDDB_LIB)
+xineplug_inp_cdx_la_LIBADD = ../xine-extra/xine-extra.@...@ $(CDDB_LIBS)
 endif
 
 debug:

Index: xineplug_inp_cd.c
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/input/xineplug_inp_cd.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xineplug_inp_cd.c	17 May 2003 08:41:16 -0000	1.16
+++ xineplug_inp_cd.c	1 Jun 2003 21:58:32 -0000	1.17
@@ -182,9 +182,6 @@
     unsigned int     disc_id;        /* This along with the length and 
 					num_tracks below is what CDDB uses
 					to look up CD info */
-#if CDDB_HAD_X_CONFIGURABLE_CACHEDIR  
-    char            *cachedir;
-#endif
   } cddb;
 #endif
 
@@ -208,18 +205,19 @@
 						    none specified in MRL
 						  */
   bool                need_init;
-  CdIo *              cdio;           /* libcdio uses this to read          */
+  CdIo *              cdio;         /* libcdio uses this to read          */
 #ifdef HAVE_CDDB
   struct  {
-    bool             enabled;        /* Do we use CDDB at all? */
-    char            *server;         /* CDDB Server to contact */
-    int              port;           /* Port number for server above */
-    bool             http;           /* Contact using HTTP protocol? */
-    char            *email;          /* Email we report back to CDDB. Can
-					be bogus to hide information. 	   */
-#if CDDB_HAD_X_CONFIGURABLE_CACHEDIR  
+    bool             enabled;       /* Do we use CDDB at all? If not,
+				       fields below are meaningless. */
+    char            *email;         /* Email we report back to CDDB. Can
+				       be bogus to hide information. 	   */
+    char            *server;        /* CDDB Server to contact */
+    int              port;          /* Port number for server above */
+    bool             http;          /* Contact using HTTP protocol? */
+    int              timeout;       /* network timeout value in seconds. */
+    bool             enable_cache;  /* If false, the below is meaningless. */
     char            *cachedir;
-#endif
   } cddb;
 #endif
 
@@ -283,10 +281,10 @@
 CHANGED_CALLBACK(cddb_enabled_changed_cb,  cddb.enabled,  num_value);
 CHANGED_CALLBACK(cddb_server_changed_cb,   cddb.server,   str_value);
 CHANGED_CALLBACK(cddb_port_changed_cb,     cddb.port,     num_value);
+CHANGED_CALLBACK(cddb_timeout_changed_cb,  cddb.timeout,  num_value);
 CHANGED_CALLBACK(cddb_http_changed_cb,     cddb.http,     num_value);
-#if CDDB_HAD_CONFIGURABLE_CACHEDIR  
+CHANGED_CALLBACK(cddb_enable_cache_cb,     cddb.enable_cache,  num_value);
 CHANGED_CALLBACK(cddb_cachedir_changed_cb, cddb.cachedir, str_value);
-#endif
 CHANGED_CALLBACK(cddb_email_changed_cb,    cddb.email,    str_value);
 
 /*
@@ -333,20 +331,6 @@
 }
 #endif /* FIXED */
 
-#if CDDB_HAD_CONFIGURABLE_CACHEDIR  
-/*
- * Where, by default, cddb cache files will be saved
- */
-static char *_cdda_cddb_get_default_location(void) {
-  static char buf[XINE_PATH_MAX + XINE_NAME_MAX + 1];
-  
-  memset(&buf, 0, sizeof(buf));
-  sprintf(buf, "%s/.cddbslave", (xine_get_homedir()));
-  
-  return buf;
-}
-#endif
-
 #define free_and_dup(var, val) \
   if (var) free(var);	       \
   if (val) var=strdup(val);	       
@@ -689,6 +673,7 @@
 /* Pointer to cdio default log handler. Set by init_input_plugin
    routine. Perhaps can remove. */
 static cdio_log_handler_t gl_default_cdio_log_handler = NULL;
+static cddb_log_handler_t gl_default_cddb_log_handler = NULL;
 
 /*! This routine is called by vcd routines on error. 
    Setup is done by init_input_plugin.
@@ -735,6 +720,22 @@
   }
 }
 
+/*! This routine is called by libcdio routines on error. 
+   Setup is done by init_input_plugin.
+*/
+static void 
+cddb_log_handler (cdio_log_level_t level, const char message[])
+{
+  switch (level) {
+  case CDDB_LOG_DEBUG:
+  case CDDB_LOG_INFO:
+    if (!(cdda_debug & INPUT_DBG_CDDB)) return;
+    /* Fall through if to warn case */
+  default:
+    cdda_log_handler (level, message);
+  }
+}
+
 /*! This routine is when xine is not around. 
    Setup is done by cdio_class_dispose.
 */
@@ -1048,6 +1049,7 @@
   cdda_input_plugin_t *this = (cdda_input_plugin_t *) this_gen;
 
   gl_default_cdio_log_handler = cdio_log_set_handler (uninit_log_handler);
+  gl_default_cddb_log_handler = cddb_log_set_handler (uninit_log_handler);
 
 #ifdef HAVE_CDDB
   _cdda_free_cddb_info(this);
@@ -1294,10 +1296,6 @@
   cdda_input_class_t  *class = (cdda_input_class_t *) cls_gen;
   track_t              track_num;
 
-#if CDDB_HAD_CONFIGURABLE_CACHEDIR  
-  xine_cfg_entry_t     cachedir_entry;
-#endif
-
   CdIo                *cdio = NULL;
   char                *device_str = 
     (char *) malloc(strlen(mrl)+strlen(class->cdda_device)+1);
@@ -1426,6 +1424,8 @@
   meta_info_assign(XINE_META_INFO_YEAR, this->stream, 
 		   this->cddb.disc_year);
     
+  gl_default_cddb_log_handler = cddb_log_set_handler (cddb_log_handler);
+
 #endif /*HAVE_CDDB*/
 
   gl_default_cdio_log_handler = cdio_log_set_handler (cdio_log_handler);
@@ -1607,6 +1607,12 @@
 			  NULL, 0,
 			  cddb_enabled_changed_cb, (void *) class);
   
+  class->cddb.enable_cache =
+    x_conf->register_bool(x_conf, "cdda.cddb_enable_cache", 1,
+			  _("Do we cache CDDB requests?"), 
+			  NULL, 0,
+			  cddb_enabled_changed_cb, (void *) class);
+  
   class->cddb.http =
     x_conf->register_bool(x_conf, "cdda.cddb_http", 0,
 			  _("Contact CDDB via the HTTP protocol?"), NULL, 0,
@@ -1620,16 +1626,20 @@
 				   cddb_server_changed_cb, (void *) class));
   class->cddb.port =
     x_conf->register_num(x_conf, "cdda.cddb_port", CDDB_PORT,
-			 _("cddb server port"), (void *) class, 10,
+			 _("CDDB server port"), (void *) class, 10,
 			 cddb_port_changed_cb, (void *) class);
 
-#if CDDB_HAD_X_CONFIGURABLE_CACHEDIR  
+  class->cddb.timeout =
+    x_conf->register_num(x_conf, "cdda.timeout", 7,
+			 _("cddb timeout value (in seconds)"), 
+			 (void *) class, 10,
+			 cddb_timeout_changed_cb, (void *) class);
+
   class->cddb.cachedir = 
     strdup(x_conf->register_string(x_conf, "cdda.cddb_cachedir", 
-				   (_cdda_cddb_get_default_location()),
-				   _("cddbp cache directory"), NULL, 20, 
+				   "~/.cddbslave",
+				   _("cddb cache directory"), NULL, 20, 
 				   cddb_cachedir_changed_cb, (void *) class));
-#endif
 
   class->cddb.email =
     strdup(x_conf->register_string(x_conf, "cdda.cddb_email", 

[xine-cvs] CVS: xine-vcdnav ChangeLog,1.7,1.8 configure.ac,1.18,1.19

[Rocky Bernstein <rockyb@us...>]

Update of /cvsroot/xine/xine-vcdnav
In directory sc8-pr-cvs1:/tmp/cvs-serv8736

Modified Files:
	ChangeLog configure.ac 
Log Message:
require libcddb 0.9.4
Can now set CDDB: 
 cachedir, 
 network timeout
 whether caching enabled.

cddb logging is supposed to go through plugin now.

There are probably some small bugs and tweaks necessary.



Index: ChangeLog
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ChangeLog	13 May 2003 03:19:46 -0000	1.7
+++ ChangeLog	1 Jun 2003 21:58:32 -0000	1.8
@@ -1,3 +1,55 @@
+2003-05-18 01:41  rockyb
+
+	* input/xineplug_inp_vcd.c: Bugs: -  Check for specifying an
+	invalid LID and if so, don't set PBC.  -  If play type not
+	specified, silently convert LID to track if there    is no PBC.
+
+2003-05-18 01:37  rockyb
+
+	* input/vcdplayer.c: vcdplayer_non_pbc_nav: Don't advance if there
+	is no next.
+
+2003-05-17 07:17  rockyb
+
+	* TODO, input/vcdplayer.c, input/vcdplayer.h: Timed wait now delays
+	no more that 1 section before giving back control to xine. As a
+	result, timed wait is a little longer that specified since we are
+	using 0 secs for the xine internal processing time.
+
+2003-05-17 04:41  rockyb
+
+	* input/xineplug_inp_cd.c: In case we want to use in the future....
+
+2003-05-16 03:37  rockyb
+
+	* input/: xineplug_inp_cd.c, xineplug_inp_vcd.c: Eject should now
+	work. Structures nulled and freed on eject.
+
+2003-05-15 04:36  rockyb
+
+	* input/xineplug_inp_cd.c: [no log message]
+
+2003-05-15 04:35  rockyb
+
+	* input/xineplug_inp_cd.c: Bug in core dump of eject media: cdio
+	structure has to be part of class since that's a class structure is
+	what is passed when we eject media. And while we are at it check
+	for a NULL pointer.
+
+2003-05-14 04:20  rockyb
+
+	* xine-vcdx.spec.in: Incorrect MRL specifier for CD-DA. Thanks yet
+	again to Manfred Tremmel <Manfred.Tremmel@...>.
+
+2003-05-12 23:41  rockyb
+
+	* TODO: [no log message]
+
+2003-05-12 23:19  rockyb
+
+	* ChangeLog, NEWS, configure.ac: Get ready for a release. This
+	time, for sure!
+
 2003-05-12 22:44  rockyb
 
 	* input/xineplug_inp_cd.c: Test for future API number.

Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/xine-vcdnav/configure.ac,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- configure.ac	13 May 2003 03:19:46 -0000	1.18
+++ configure.ac	1 Jun 2003 21:58:32 -0000	1.19
@@ -360,21 +360,15 @@
 		enable_cddb=yes)
 fi
 if test x$enable_cddb = xyes; then
-    AC_CHECK_LIB(cddb, cddb_disc_calc_discid,
-                 [ CDDB_LIB="-lcddb"; ac_have_cddb=yes ])
-dnl    AC_DEFINE([HAVE_CDDB],1,
-dnl	      [Define this if you have libcddb installed])
-    AC_TRY_COMPILE([#include <cddb/cddb.h>],[
- cddb_conn_t *conn;
- cddb_http_enable(conn);
- ], [
+   PKG_CHECK_MODULES(CDDB, libcddb >= 0.9.4, [
     HAVE_CDDB=yes 
     AC_DEFINE(HAVE_CDDB, [], [Define this if you have libcddb installed])
     ],
- AC_MSG_WARN(libcddb library might not be new enough; need version 0.90 or greater), 
-    HAVE_CDDB=no)
+    [AC_MSG_WARN(new enough libcddb not found. CDDB access disabled) 
+    HAVE_CDDB=no])
+    AC_CHECK_LIB(socket, connect)
+    AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname))
 fi
-
 
 AC_SUBST(CDDB_LIB)