Ticket #165: aos_wait.diff

libao2/ao_alsa.c

@@ -741 +741 @@
   if (alsa_handler) {
     int err;
 
+    if (!immed)
+      snd_pcm_drain(alsa_handler);
+
     if (!ao_noblock) {
       if ((err = snd_pcm_drop(alsa_handler)) < 0)
         {

libao2/ao_dsound.c

@@ -495 +495 @@
 */
 static void uninit(int immed)
 {
+        if (immed)
         reset();
         DestroyBuffer();
         UninitDirectSound();

libao2/ao_nas.c

@@ -481 +481 @@
         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);

libao2/ao_sdl.c

@@ -293 +293 @@
 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);
 }

libao2/ao_sgi.c

@@ -126 +126 @@
   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);