[pulseaudio-commits] r1442 - /trunk/src/modules/module-oss.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Wed May 23 03:02:06 2007
New Revision: 1442

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1442&root=3Dpulseaudio&vi=
ew=3Drev
Log:
Fix module-oss for devices that return EAGAIN when we don't expect it. (Clo=
ses #66)

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

Modified: trunk/src/modules/module-oss.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/module-oss.c?=
rev=3D1442&root=3Dpulseaudio&r1=3D1441&r2=3D1442&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/src/modules/module-oss.c (original)
+++ trunk/src/modules/module-oss.c Wed May 23 03:02:06 2007
@@ -169,10 +169,14 @@
         assert(memchunk->length);
 =

         if ((r =3D pa_iochannel_write(u->io, (uint8_t*) memchunk->memblock=
->data + memchunk->index, memchunk->length)) < 0) {
-            pa_log("write() failed: %s", pa_cstrerror(errno));
-
-            clear_up(u);
-            pa_module_unload_request(u->module);
+
+            if (errno !=3D EAGAIN) {
+                pa_log("write() failed: %s", pa_cstrerror(errno));
+                =

+                clear_up(u);
+                pa_module_unload_request(u->module);
+            }
+            =

             break;
         }
 =

@@ -224,11 +228,14 @@
         assert(memchunk.memblock);
         if ((r =3D pa_iochannel_read(u->io, memchunk.memblock->data, memch=
unk.memblock->length)) < 0) {
             pa_memblock_unref(memchunk.memblock);
+            =

             if (errno !=3D EAGAIN) {
                 pa_log("read() failed: %s", pa_cstrerror(errno));
+                =

                 clear_up(u);
                 pa_module_unload_request(u->module);
             }
+            =

             break;
         }
 =