[xiph-cvs] cvs commit: ao/src/plugins/oss ao_oss.c

[Warren Dukes]

shank       04/04/12 18:53:02

  Modified:    src/plugins/oss ao_oss.c
  Log:
  check that mono/stereo is actually set as disired by OSS device
  by checking what tmp is set to

Revision  Changes    Path
1.18      +1 -1      ao/src/plugins/oss/ao_oss.c

Index: ao_oss.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/oss/ao_oss.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- a/ao_oss.c	9 Mar 2004 00:05:44 -0000	1.17
+++ b/ao_oss.c	12 Apr 2004 22:53:01 -0000	1.18
@@ -231,7 +231,7 @@
                 goto ERR;
         }
         
-	if (ioctl(internal->fd,SNDCTL_DSP_STEREO,&tmp) < 0) {
+	if (ioctl(internal->fd,SNDCTL_DSP_STEREO,&tmp) < 0 || tmp+1 != format) {
                 fprintf(stderr, "libao - OSS cannot set channels to %d\n", 
                         format->channels);
                 goto ERR;

<p><p>--- >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.