From 01191a83924516d7fe1212f707c73d3b401d4b5a Mon Sep 17 00:00:00 2001 From: ivo Date: Sat, 26 Feb 2005 23:03:53 +0000 Subject: 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). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14835 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libao2/ao_oss.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libao2') diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c index ce5d81c78b..121aa009ea 100644 --- a/libao2/ao_oss.c +++ b/libao2/ao_oss.c @@ -289,8 +289,9 @@ ac3_retry: 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; } -- cgit v1.2.3