# HG changeset patch
# User henry
# Date 1047674186 0
# Node ID f023b30c80e551e053881125442dc5c6f69bd01b
# Parent  2cc1ce724722238651863632b8c62298806ddb94
replace snd_pcm_drain with snd_pcm_drop

diff -r 2cc1ce724722 -r f023b30c80e5 libao2/ao_alsa1x.c
--- a/libao2/ao_alsa1x.c	Fri Mar 14 17:50:58 2003 +0000
+++ b/libao2/ao_alsa1x.c	Fri Mar 14 20:36:26 2003 +0000
@@ -750,24 +750,17 @@
 {
     int err;
 
-    if (!ao_noblock) {
-      //drain causes error in nonblock-mode!
-      if ((err = snd_pcm_drain(alsa_handler)) < 0)
-	{
-	  printf("alsa-pause: pcm drain error: %s\n", snd_strerror(err));
-	  return;
-	}
-
-      if ((err = snd_pcm_prepare(alsa_handler)) < 0)
-	{
-	  printf("alsa-reset: pcm prepare error: %s\n", snd_strerror(err));
-	  return;
-	}
-    } else {
-      if (verbose>0)
-	printf("alsa-reset: reset nonblocked");
-      return;
+    if ((err = snd_pcm_drop(alsa_handler)) < 0)
+    {
+	printf("alsa-reset: pcm drop error: %s\n", snd_strerror(err));
+	return;
     }
+    if ((err = snd_pcm_prepare(alsa_handler)) < 0)
+    {
+	printf("alsa-reset: pcm prepare error: %s\n", snd_strerror(err));
+	return;
+    }
+    return;
 }
 
 #ifdef USE_POLL
diff -r 2cc1ce724722 -r f023b30c80e5 libao2/ao_alsa9.c
--- a/libao2/ao_alsa9.c	Fri Mar 14 17:50:58 2003 +0000
+++ b/libao2/ao_alsa9.c	Fri Mar 14 20:36:26 2003 +0000
@@ -750,24 +750,17 @@
 {
     int err;
 
-    if (!ao_noblock) {
-      //drain causes error in nonblock-mode!
-      if ((err = snd_pcm_drain(alsa_handler)) < 0)
-	{
-	  printf("alsa-pause: pcm drain error: %s\n", snd_strerror(err));
-	  return;
-	}
-
-      if ((err = snd_pcm_prepare(alsa_handler)) < 0)
-	{
-	  printf("alsa-reset: pcm prepare error: %s\n", snd_strerror(err));
-	  return;
-	}
-    } else {
-      if (verbose>0)
-	printf("alsa-reset: reset nonblocked");
-      return;
+    if ((err = snd_pcm_drop(alsa_handler)) < 0)
+    {
+	printf("alsa-reset: pcm drop error: %s\n", snd_strerror(err));
+	return;
     }
+    if ((err = snd_pcm_prepare(alsa_handler)) < 0)
+    {
+	printf("alsa-reset: pcm prepare error: %s\n", snd_strerror(err));
+	return;
+    }
+    return;
 }
 
 #ifdef USE_POLL