[Mplayer-cvslog] CVS: main/libao2 ao_alsa9.c,1.30,1.31

Jindrich Makovicka CVS henry at mplayerhq.hu
Fri Mar 14 21:36:48 CET 2003


Update of /cvsroot/mplayer/main/libao2
In directory mail:/var/tmp.root/cvs-serv22945

Modified Files:
	ao_alsa9.c 
Log Message:
replace snd_pcm_drain with snd_pcm_drop

Index: ao_alsa9.c
===================================================================
RCS file: /cvsroot/mplayer/main/libao2/ao_alsa9.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ao_alsa9.c	10 Jan 2003 18:28:18 -0000	1.30
+++ ao_alsa9.c	14 Mar 2003 20:36:26 -0000	1.31
@@ -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



More information about the MPlayer-cvslog mailing list