diff options
author | cladisch <cladisch@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-10 09:26:11 +0000 |
---|---|---|
committer | cladisch <cladisch@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-10 09:26:11 +0000 |
commit | 18ca43b048a94ea0f5b6898833291bc051ec0950 (patch) | |
tree | b89d1791eaa0e895bc6d8a763e891995ad0ff2db /libao2 | |
parent | a25341464ca043e26e189f92772d3357d3f039f5 (diff) | |
download | mpv-18ca43b048a94ea0f5b6898833291bc051ec0950.tar.bz2 mpv-18ca43b048a94ea0f5b6898833291bc051ec0950.tar.xz |
Remove a call to snd_pcm_prepare() because snd_pcm_hw_params() does it
automatically, and remove a call to snd_pcm_drop() because
snd_pcm_close() does it automatically.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17575 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
-rw-r--r-- | libao2/ao_alsa.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index 7c44974f06..45b49ed1e8 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -662,11 +662,6 @@ static int init(int rate_hz, int channels, int format, int flags) mp_msg(MSGT_AO,MSGL_V,"alsa-init: bits per sample (bps)=%i, bits per frame (bpf)=%i, chunk_bytes=%i\n",bits_per_sample,bits_per_frame,chunk_bytes);} //end swparams - if ((err = snd_pcm_prepare(alsa_handler)) < 0) - { - mp_msg(MSGT_AO,MSGL_ERR,"alsa-init: pcm prepare error: %s\n", snd_strerror(err)); - } - mp_msg(MSGT_AO,MSGL_INFO,"alsa: %d Hz/%d channels/%d bpf/%d bytes buffer/%s\n", ao_data.samplerate, ao_data.channels, bytes_per_sample, ao_data.buffersize, snd_pcm_format_description(alsa_format)); @@ -687,14 +682,6 @@ static void uninit(int immed) if (!immed) snd_pcm_drain(alsa_handler); - if (!ao_noblock) { - if ((err = snd_pcm_drop(alsa_handler)) < 0) - { - mp_msg(MSGT_AO,MSGL_ERR,"alsa-uninit: pcm drop error: %s\n", snd_strerror(err)); - return; - } - } - if ((err = snd_pcm_close(alsa_handler)) < 0) { mp_msg(MSGT_AO,MSGL_ERR,"alsa-uninit: pcm close error: %s\n", snd_strerror(err)); |