[polypaudio-commits] r826 - /trunk/src/modules/oss-util.c

[svnmailer-noreply at 0pointer.de]

Author: ossman
Date: Tue May  2 13:27:24 2006
New Revision: 826

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=826&root=polypaudio&view=rev
Log:
Fix control flow in pa_oss_open(). Also fall back to half duplex when device doesn't
support full.

Modified:
    trunk/src/modules/oss-util.c

Modified: trunk/src/modules/oss-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/oss-util.c?rev=826&root=polypaudio&r1=825&r2=826&view=diff
==============================================================================
--- trunk/src/modules/oss-util.c (original)
+++ trunk/src/modules/oss-util.c Tue May  2 13:27:24 2006
@@ -56,9 +56,11 @@
             }
 
             if (*tcaps & DSP_CAP_DUPLEX)
-                return fd;
-
-            goto fail;
+                goto success;
+
+            pa_log_warn(__FILE__": '%s' doesn't support full duplex", device);
+
+            close(fd);
         }
         
         if ((fd = open(device, (*mode = O_WRONLY)|O_NDELAY)) < 0) {
@@ -73,6 +75,8 @@
             goto fail;
         }
     } 
+
+success:
 
     if (pcaps) {
         if (ioctl(fd, SNDCTL_DSP_GETCAPS, pcaps) < 0) {