summaryrefslogtreecommitdiffstats
path: root/libao2/ao_nas.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-02-27 23:06:32 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-02-27 23:06:32 +0000
commit95cf851ea67f41c3c8b2da81c1d6dd55ab47458a (patch)
tree397d495bb6918e0ee03aa9b0517a67ca524fc606 /libao2/ao_nas.c
parent4c3d533c7dd64294c77e528e22f88da2b67937a8 (diff)
downloadmpv-95cf851ea67f41c3c8b2da81c1d6dd55ab47458a.tar.bz2
mpv-95cf851ea67f41c3c8b2da81c1d6dd55ab47458a.tar.xz
aos should respect the immed uninit flag (quit immediatly vs waiting till file
is played to end). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14850 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2/ao_nas.c')
-rw-r--r--libao2/ao_nas.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libao2/ao_nas.c b/libao2/ao_nas.c
index c040432f7d..f99573f915 100644
--- a/libao2/ao_nas.c
+++ b/libao2/ao_nas.c
@@ -482,6 +482,7 @@ static void uninit(int immed){
mp_msg(MSGT_AO, MSGL_DBG3, "ao_nas: uninit()\n");
nas_data->expect_underrun = 1;
+ if (!immed)
while (nas_data->state != AuStateStop) usleep(1000);
nas_data->stop_thread = 1;
pthread_join(nas_data->event_thread, NULL);