[Mplayer-cvslog] CVS: main cfg-common.h, 1.125, 1.126 configure, 1.828, 1.829

[Jindrich Makovicka CVS]

Update of /cvsroot/mplayer/main
In directory mail:/scsi/2/tmp/cvs-serv18040

Modified Files:
	cfg-common.h configure 
Log Message:
ALSA 1.x audio out driver

Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- cfg-common.h	8 Jan 2004 18:02:31 -0000	1.125
+++ cfg-common.h	11 Jan 2004 17:07:31 -0000	1.126
@@ -351,7 +351,7 @@
 	{"mjpeg", &tv_param_mjpeg, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 	{"decimation", &tv_param_decimation, CONF_TYPE_INT, CONF_RANGE, 1, 4, NULL},
 	{"quality", &tv_param_quality, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL},
-#ifdef HAVE_ALSA9
+#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X)
 	{"alsa", &tv_param_alsa, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 #endif
 	{"adevice", &tv_param_adevice, CONF_TYPE_STRING, 0, 0, 0, NULL},

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.828
retrieving revision 1.829
diff -u -r1.828 -r1.829
--- configure	10 Jan 2004 13:25:39 -0000	1.828
+++ configure	11 Jan 2004 17:07:31 -0000	1.829
@@ -3936,6 +3936,7 @@
 fi
 _def_alsa5='#undef HAVE_ALSA5'
 _def_alsa9='#undef HAVE_ALSA9'
+_def_alsa1x='#undef HAVE_ALSA1X'
 _def_sys_asoundlib_h='#undef HAVE_SYS_ASOUNDLIB_H'
 _def_alsa_asoundlib_h='#undef HAVE_ALSA_ASOUNDLIB_H'
 if test "$_alsaver" ; then
@@ -3958,19 +3959,15 @@
     _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1'
     echores "yes (using alsa 0.9.x and alsa/asoundlib.h)"
   elif test "$_alsaver" = '1.0.x-sys' ; then
-    _aosrc="$_aosrc ao_alsa9.c"
-    _aomodules="alsa9 $_aomodules"
-    _def_alsa9="#define ALSA_PCM_OLD_HW_PARAMS_API 1
-#define ALSA_PCM_OLD_SW_PARAMS_API 1
-#define HAVE_ALSA9 1"
+    _aosrc="$_aosrc ao_alsa1x.c"
+    _aomodules="alsa1x $_aomodules"
+    _def_alsa1x="#define HAVE_ALSA1X 1"
     _def_alsa_asoundlib_h='#define HAVE_SYS_ASOUNDLIB_H 1'
     echores "yes (using alsa 1.0.x and sys/asoundlib.h)"
   elif test "$_alsaver" = '1.0.x-alsa' ; then
-    _aosrc="$_aosrc ao_alsa9.c"
-    _aomodules="alsa9 $_aomodules"
-    _def_alsa9="#define ALSA_PCM_OLD_HW_PARAMS_API 1
-#define ALSA_PCM_OLD_SW_PARAMS_API 1
-#define HAVE_ALSA9 1"
+    _aosrc="$_aosrc ao_alsa1x.c"
+    _aomodules="alsa1x $_aomodules"
+    _def_alsa1x="#define HAVE_ALSA1X 1"
     _def_alsa_asoundlib_h='#define HAVE_ALSA_ASOUNDLIB_H 1'
     echores "yes (using alsa 1.0.x and alsa/asoundlib.h)"
   fi
@@ -6250,6 +6247,7 @@
 $_def_ossaudio_devmixer
 $_def_alsa5
 $_def_alsa9
+$_def_alsa1x
 $_def_arts
 $_def_esd
 $_def_esd_latency