diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-07 17:32:44 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-04-07 17:32:44 +0000 |
commit | 885709eadda14524d0fe12ce423f6cc17b2c1e6b (patch) | |
tree | 15ae621a9873c783baf0cc81081d3eeeb026eede /libao2 | |
parent | f827599b48798d45fee97fa5149f5b49aa230440 (diff) | |
download | mpv-885709eadda14524d0fe12ce423f6cc17b2c1e6b.tar.bz2 mpv-885709eadda14524d0fe12ce423f6cc17b2c1e6b.tar.xz |
AUDIO_DRAIN makes no sense directly after opening
the device, but it should be done in uninit.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26344 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
-rw-r--r-- | libao2/ao_sun.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libao2/ao_sun.c b/libao2/ao_sun.c index c1ef3a43a8..773f0d0d4a 100644 --- a/libao2/ao_sun.c +++ b/libao2/ao_sun.c @@ -478,8 +478,6 @@ static int init(int rate,int channels,int format,int flags){ return 0; } - ioctl(audio_fd, AUDIO_DRAIN, 0); - if (af2sunfmt(format) == AUDIO_ENCODING_NONE) format = AF_FORMAT_S16_NE; @@ -583,6 +581,8 @@ static void uninit(int immed){ // throw away buffered data in the audio driver's STREAMS queue if (immed) flush_audio(audio_fd); + else + ioctl(audio_fd, AUDIO_DRAIN, 0); close(audio_fd); } |