# HG changeset patch
# User reimar
# Date 1109545592 0
# Node ID d313f591d1a4ba1eb24930c40e5e4a35818bba6c
# Parent  f92a93cfc50864ea6fb7c9e10ca3706da7ba7876
aos should respect the immed uninit flag (quit immediatly vs waiting till file
is played to end).

diff -r f92a93cfc508 -r d313f591d1a4 libao2/ao_alsa.c
--- a/libao2/ao_alsa.c	Sun Feb 27 22:36:04 2005 +0000
+++ b/libao2/ao_alsa.c	Sun Feb 27 23:06:32 2005 +0000
@@ -687,6 +687,9 @@
   if (alsa_handler) {
     int err;
 
+    if (!immed)
+      snd_pcm_drain(alsa_handler);
+
     if (!ao_noblock) {
       if ((err = snd_pcm_drop(alsa_handler)) < 0)
 	{
diff -r f92a93cfc508 -r d313f591d1a4 libao2/ao_nas.c
--- a/libao2/ao_nas.c	Sun Feb 27 22:36:04 2005 +0000
+++ b/libao2/ao_nas.c	Sun Feb 27 23:06:32 2005 +0000
@@ -482,6 +482,7 @@
 	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);
diff -r f92a93cfc508 -r d313f591d1a4 libao2/ao_sdl.c
--- a/libao2/ao_sdl.c	Sun Feb 27 22:36:04 2005 +0000
+++ b/libao2/ao_sdl.c	Sun Feb 27 23:06:32 2005 +0000
@@ -293,8 +293,7 @@
 static void uninit(int immed){
 	mp_msg(MSGT_AO,MSGL_V,"SDL: Audio Subsystem shutting down!\n");
 	if (!immed)
-	while(buf_free() < BUFFSIZE - CHUNK_SIZE)
-		usec_sleep(50000);
+	  usec_sleep(get_delay() * 1000 * 1000);
 	SDL_CloseAudio();
 	SDL_QuitSubSystem(SDL_INIT_AUDIO);
 }
diff -r f92a93cfc508 -r d313f591d1a4 libao2/ao_sgi.c
--- a/libao2/ao_sgi.c	Sun Feb 27 22:36:04 2005 +0000
+++ b/libao2/ao_sgi.c	Sun Feb 27 23:06:32 2005 +0000
@@ -126,6 +126,7 @@
   mp_msg(MSGT_AO, MSGL_INFO, MSGTR_AO_SGI_Uninit);
 
   if (ao_port) {
+    if (!immed)
     while(alGetFilled(ao_port) > 0) sginap(1);  
     alClosePort(ao_port);
     alFreeConfig(ao_config);