summaryrefslogtreecommitdiffstats
path: root/libao2/ao_oss.c
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-12-28 19:11:14 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-12-28 19:11:14 +0000
commit14a29762f2df7e819096112269de6acca0aecb61 (patch)
tree711767bd6bb682709eaa0f88161c07ae87925b83 /libao2/ao_oss.c
parente8739c6d9276cd05361b061a2510e26b84c53cec (diff)
downloadmpv-14a29762f2df7e819096112269de6acca0aecb61.tar.bz2
mpv-14a29762f2df7e819096112269de6acca0aecb61.tar.xz
af_fmt2str_short
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14265 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2/ao_oss.c')
-rw-r--r--libao2/ao_oss.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c
index 7af6156245..c72f6de15a 100644
--- a/libao2/ao_oss.c
+++ b/libao2/ao_oss.c
@@ -184,8 +184,8 @@ static int init(int rate,int channels,int format,int flags){
char *mixer_channels [SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_NAMES;
int oss_format;
-// mp_msg(MSGT_AO,MSGL_V,"ao2: %d Hz %d chans %s\n",rate,channels,
-// audio_out_format_name(format));
+ mp_msg(MSGT_AO,MSGL_V,"ao2: %d Hz %d chans %s\n",rate,channels,
+ af_fmt2str_short(format));
if (ao_subdevice)
dsp = ao_subdevice;
@@ -275,8 +275,6 @@ ac3_retry:
#endif
goto ac3_retry;
}
-// mp_msg(MSGT_AO,MSGL_V,"audio_setup: sample format: %s (requested: %s)\n",
-// audio_out_format_name(ao_data.format), audio_out_format_name(format));
#if 0
if(oss_format!=format2oss(format))
mp_msg(MSGT_AO,MSGL_WARN,"WARNING! Your soundcard does NOT support %s sample format! Broken audio or bad playback speed are possible! Try with '-aop list=format'\n",audio_out_format_name(format));
@@ -284,6 +282,9 @@ ac3_retry:
ao_data.format = oss2format(oss_format);
if (ao_data.format == -1) return 0;
+
+ mp_msg(MSGT_AO,MSGL_V,"audio_setup: sample format: %s (requested: %s)\n",
+ af_fmt2str_short(ao_data.format), af_fmt2str_short(format));
ao_data.channels = channels;
if(format != AF_FORMAT_AC3) {