[xiph-cvs] cvs commit: ao/src/plugins/alsa09 ao_alsa09.c

[Stan Seibert]

volsung     01/12/18 14:39:24

  Modified:    src      ao_null.c
               src/plugins/alsa ao_alsa.c
               src/plugins/alsa09 ao_alsa09.c
  Log:
  Forgot to advertise the "debug" option to the null driver.
  Commented out underrun error message in ALSA drivers.

Revision  Changes    Path
1.8       +5 -2      ao/src/ao_null.c

Index: ao_null.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/ao_null.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ao_null.c	2001/11/14 17:11:44	1.7
+++ ao_null.c	2001/12/18 22:39:23	1.8
@@ -28,6 +28,9 @@
 #include <string.h>
 #include <ao/ao.h>
 
+static char *ao_null_options[] = {
+	"debug"
+};
 static ao_info ao_null_info = {
         AO_TYPE_LIVE,
         "Null output",
@@ -36,8 +39,8 @@
         "This driver does nothing.",
         AO_FMT_NATIVE,
         0,
-	NULL, /* No options */
-	0
+	ao_null_options,
+	1
 };
 
 

1.8       +1 -1      ao/src/plugins/alsa/ao_alsa.c

Index: ao_alsa.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/alsa/ao_alsa.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ao_alsa.c	2001/11/09 20:06:09	1.7
+++ ao_alsa.c	2001/12/18 22:39:23	1.8
@@ -210,7 +210,7 @@
                 return 0;
         }       
         if (status.underrun) {
-		fprintf(stderr, "ALSA: underrun. resetting channel\n");
+		/* fprintf(stderr, "ALSA: underrun. resetting channel\n"); */
                 snd_pcm_channel_flush(pcm_handle, SND_PCM_CHANNEL_PLAYBACK);
                 snd_pcm_playback_prepare(pcm_handle);
                 snd_pcm_write(pcm_handle, s->buf, len);

1.11      +1 -1      ao/src/plugins/alsa09/ao_alsa09.c

Index: ao_alsa09.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/alsa09/ao_alsa09.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ao_alsa09.c	2001/12/09 03:35:21	1.10
+++ ao_alsa09.c	2001/12/18 22:39:24	1.11
@@ -237,7 +237,7 @@
                 }
         } while (len > 0 && (res > 0 || res == -EAGAIN));
         if (res == -EPIPE) {
-		fprintf(stderr, "ALSA: underrun. resetting stream\n");
+		/* fprintf(stderr, "ALSA: underrun. resetting stream\n"); */
                 snd_pcm_prepare(internal->pcm_handle);
                 res = snd_pcm_writei(internal->pcm_handle, buf, len);
                 if (res != len) {

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.