[Mplayer-cvslog] CVS: main/libao2 ao_dxr2.c,1.3,1.4 ao_mpegpes.c,1.13,1.14 audio_out.c,1.26,1.27

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libao2
In directory mail:/var/tmp.root/cvs-serv3249

Modified Files:
	ao_dxr2.c ao_mpegpes.c audio_out.c 
Log Message:
10l


Index: ao_dxr2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_dxr2.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ao_dxr2.c	17 May 2002 23:51:36 -0000	1.3
+++ ao_dxr2.c	6 Oct 2002 01:08:04 -0000	1.4
@@ -73,7 +73,7 @@
 
 	ao_data.outburst=2048;
 	ao_data.samplerate=rate;
-	ao_data.channels=channels;
+	ao_data.channels=2; //channels;
 	ao_data.buffersize=2048;
 	ao_data.bps=rate*4;
 	ao_data.format=format;

Index: ao_mpegpes.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_mpegpes.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ao_mpegpes.c	6 Oct 2002 00:22:32 -0000	1.13
+++ ao_mpegpes.c	6 Oct 2002 01:08:04 -0000	1.14
@@ -17,9 +17,9 @@
 #ifdef HAVE_DVB
 #include <ost/audio.h>
 audioMixer_t dvb_mixer={255,255};
+#endif
 extern int vo_mpegpes_fd;
 extern int vo_mpegpes_fd2;
-#endif
 
 #include <errno.h>
 

Index: audio_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/audio_out.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- audio_out.c	29 Sep 2002 22:57:54 -0000	1.26
+++ audio_out.c	6 Oct 2002 01:08:04 -0000	1.27
@@ -25,9 +25,6 @@
 #ifdef HAVE_ALSA9
  extern ao_functions_t audio_out_alsa9;
 #endif
-#ifdef HAVE_ESD
- extern ao_functions_t audio_out_esd;
-#endif
 #ifdef HAVE_NAS
 extern ao_functions_t audio_out_nas;
 #endif
@@ -50,30 +47,30 @@
 
 ao_functions_t* audio_out_drivers[] =
 {
+// vo-related:   will fail unless you also do -vo mpegpes/dxr2
+	&audio_out_mpegpes,
+#ifdef HAVE_DXR2
+        &audio_out_dxr2,
+#endif
+// native:
 #ifdef USE_OSS_AUDIO
         &audio_out_oss,
 #endif
-#ifdef USE_ARTS
-        &audio_out_arts,
+#ifdef HAVE_ALSA9
+	&audio_out_alsa9,
 #endif
-#ifdef USE_SUN_AUDIO
-        &audio_out_sun,
+#ifdef HAVE_ALSA5
+	&audio_out_alsa5,
 #endif
 #ifdef USE_SGI_AUDIO
         &audio_out_sgi,
 #endif
-#ifdef HAVE_DXR2
-        &audio_out_dxr2,
-#endif
-        &audio_out_null,
-#ifdef HAVE_ALSA5
-	&audio_out_alsa5,
-#endif
-#ifdef HAVE_ALSA9
-	&audio_out_alsa9,
+#ifdef USE_SUN_AUDIO
+        &audio_out_sun,
 #endif
-#ifdef HAVE_ESD
-	&audio_out_esd,
+// wrappers:
+#ifdef USE_ARTS
+        &audio_out_arts,
 #endif
 #ifdef HAVE_NAS
 	&audio_out_nas,
@@ -81,10 +78,10 @@
 #ifdef HAVE_SDL
         &audio_out_sdl,
 #endif
-	&audio_out_mpegpes,
+        &audio_out_null,
+// should not be auto-selected:
 	&audio_out_pcm,
 	&audio_out_plugin,
-//	&audio_out_pss,
 	NULL
 };