summaryrefslogtreecommitdiffstats
path: root/libao2/ao_alsa.c
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-12-27 18:10:30 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-12-27 18:10:30 +0000
commit4d7d3bf2c03202878bcfb519e821d2c2fb8d1b79 (patch)
tree9bb9b239ff2cd0a1a2adcd6859a638876836555b /libao2/ao_alsa.c
parent85b7553d0546163e402ba5ea287b541605d9682b (diff)
downloadmpv-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_alsa.c')
-rw-r--r--libao2/ao_alsa.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c
index 539fd0fa7c..db23f1b532 100644
--- a/libao2/ao_alsa.c
+++ b/libao2/ao_alsa.c
@@ -256,8 +256,8 @@ static int init(int rate_hz, int channels, int format, int flags)
// make sure alsa_device is null-terminated even when using strncpy etc.
memset(alsa_device, 0, ALSA_DEVICE_SIZE + 1);
- mp_msg(MSGT_AO,MSGL_V,"alsa-init: requested format: %d Hz, %d channels, %s\n", rate_hz,
- channels, audio_out_format_name(format));
+ mp_msg(MSGT_AO,MSGL_V,"alsa-init: requested format: %d Hz, %d channels, %x\n", rate_hz,
+ channels, format);
alsa_handler = NULL;
mp_msg(MSGT_AO,MSGL_V,"alsa-init: compiled for ALSA-%s\n", SND_LIB_VERSION_STR);
@@ -334,8 +334,7 @@ static int init(int rate_hz, int channels, int format, int flags)
ao_data.bps *= 4;
break;
case -1:
- mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: invalid format (%s) requested - output disabled\n",
- audio_out_format_name(format));
+ mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: invalid format (%x) requested - output disabled\n",format);
return(0);
break;
default:
@@ -587,8 +586,7 @@ static int init(int rate_hz, int channels, int format, int flags)
alsa_format)) < 0)
{
mp_msg(MSGT_AO,MSGL_INFO,
- "alsa-init: format %s are not supported by hardware, trying default\n",
- audio_out_format_name(format));
+ "alsa-init: format %x are not supported by hardware, trying default\n", format);
alsa_format = SND_PCM_FORMAT_S16_LE;
ao_data.format = AF_FORMAT_S16_LE;
ao_data.bps = channels * rate_hz * 2;