[MPlayer-cvslog] CVS: main/libao2 ao_oss.c,1.52,1.53

[Ivo van Poorten CVS]

CVS change done by Ivo van Poorten CVS

Update of /cvsroot/mplayer/main/libao2
In directory mail:/var2/tmp/cvs-serv7176/libao2

Modified Files:
	ao_oss.c 
Log Message:

Have OSS audio out fall back to s16ne instead of u8 if it can't open the
soundcard for 3+ channels and do it for all audio streams (not only AC3).



Index: ao_oss.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_oss.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- ao_oss.c	29 Jan 2005 12:58:16 -0000	1.52
+++ ao_oss.c	26 Feb 2005 23:03:53 -0000	1.53
@@ -289,8 +289,9 @@
     format=AF_FORMAT_S16_NE;
   }
   if( ioctl(audio_fd, SNDCTL_DSP_SETFMT, &oss_format)<0 ||
-      oss_format != format2oss(format)) if(format == AF_FORMAT_AC3){
-    mp_msg(MSGT_AO,MSGL_WARN, MSGTR_AO_OSS_CantSetAC3, dsp);
+      oss_format != format2oss(format)) {
+    mp_msg(MSGT_AO,MSGL_WARN, MSGTR_AO_OSS_CantSet, dsp,
+            af_fmt2str_short(format), af_fmt2str_short(AF_FORMAT_S16_NE) );
     format=AF_FORMAT_S16_NE;
     goto ac3_retry;
   }