[pulseaudio-commits] r1475 - /branches/lennart/src/modules/module-pipe-sink.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Thu Jun 14 18:53:40 2007
New Revision: 1475

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1475&root=3Dpulseaudio&vi=
ew=3Drev
Log:
trivial cleanups

Modified:
    branches/lennart/src/modules/module-pipe-sink.c

Modified: branches/lennart/src/modules/module-pipe-sink.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/mo=
dule-pipe-sink.c?rev=3D1475&root=3Dpulseaudio&r1=3D1474&r2=3D1475&view=3Ddi=
ff
=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
--- branches/lennart/src/modules/module-pipe-sink.c (original)
+++ branches/lennart/src/modules/module-pipe-sink.c Thu Jun 14 18:53:40 2007
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <stdio.h>
-#include <assert.h>
 #include <errno.h>
 #include <string.h>
 #include <fcntl.h>
@@ -40,7 +39,6 @@
 #include <pulse/xmalloc.h>
 =

 #include <pulsecore/core-error.h>
-#include <pulsecore/iochannel.h>
 #include <pulsecore/sink.h>
 #include <pulsecore/module.h>
 #include <pulsecore/core-util.h>
@@ -170,6 +168,8 @@
                 l =3D pa_write(u->fd, (uint8_t*) p + u->memchunk.index, u-=
>memchunk.length, &write_type);
                 pa_memblock_release(u->memchunk.memblock);
 =

+                pa_assert(l !=3D 0);
+                =

                 if (l < 0) {
 =

                     if (errno =3D=3D EINTR)
@@ -202,7 +202,10 @@
         if (pa_asyncmsgq_before_poll(u->asyncmsgq) < 0)
             continue;
 =

+/*         pa_log("polling for %u (underrun=3D%i)", pollfd[POLLFD_FIFO].ev=
ents, underrun);  */
         r =3D poll(pollfd, POLLFD_MAX, -1);
+/*         pa_log("polling got %u", r > 0 ? pollfd[POLLFD_FIFO].revents : =
0);  */
+
         pa_asyncmsgq_after_poll(u->asyncmsgq);
 =

         if (r < 0) {
@@ -232,11 +235,11 @@
 }
 =

 int pa__init(pa_core *c, pa_module*m) {
-    struct userdata *u =3D NULL;
+    struct userdata *u;
     struct stat st;
     pa_sample_spec ss;
     pa_channel_map map;
-    pa_modargs *ma =3D NULL;
+    pa_modargs *ma;
     char *t;
 =

     pa_assert(c);