diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-27 18:10:30 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-27 18:10:30 +0000 |
| commit | 4d7d3bf2c03202878bcfb519e821d2c2fb8d1b79 (patch) | |
| tree | 9bb9b239ff2cd0a1a2adcd6859a638876836555b /libao2/ao_sun.c | |
| parent | 85b7553d0546163e402ba5ea287b541605d9682b (diff) | |
| download | mpv-4d7d3bf2c03202878bcfb519e821d2c2fb8d1b79.tar.bz2 mpv-4d7d3bf2c03202878bcfb519e821d2c2fb8d1b79.tar.xz | |
hopefully final fix
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14250 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2/ao_sun.c')
| -rw-r--r-- | libao2/ao_sun.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libao2/ao_sun.c b/libao2/ao_sun.c index b9b6a3a9f4..2e102ccfa1 100644 --- a/libao2/ao_sun.c +++ b/libao2/ao_sun.c @@ -457,6 +457,7 @@ static int init(int rate,int channels,int format,int flags){ audio_info_t info; int pass; int ok; + char buf[128]; setup_device_paths(); @@ -479,7 +480,7 @@ static int init(int rate,int channels,int format,int flags){ for (ok = pass = 0; pass <= 5; pass++) { /* pass 6&7 not useful */ AUDIO_INITINFO(&info); - info.play.encoding = oss2sunfmt(ao_data.format = format); + info.play.encoding = af2sunfmt(ao_data.format = format); info.play.precision = (format==AF_FORMAT_S16_LE || format==AF_FORMAT_S16_BE ? AUDIO_PRECISION_16 @@ -545,7 +546,7 @@ static int init(int rate,int channels,int format,int flags){ if (!ok) { mp_msg(MSGT_AO, MSGL_ERR, MSGTR_AO_SUN_UnsupSampleRate, - channels, audio_out_format_name(format), rate); + channels, af_fmt2str(format, &buf, 128), rate); return 0; } @@ -625,7 +626,7 @@ static void reset(){ ioctl(audio_fd, AUDIO_DRAIN, 0); AUDIO_INITINFO(&info); - info.play.encoding = oss2sunfmt(ao_data.format); + info.play.encoding = af2sunfmt(ao_data.format); info.play.precision = (ao_data.format==AF_FORMAT_S16_LE || ao_data.format==AF_FORMAT_S16_BE ? AUDIO_PRECISION_16 |