Revert r1404 and keep it on a development branch until it is fully tested.

[profile/ivi/pulseaudio-panda.git] / src / modules / module-pipe-source.c

diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c
index 99f4f3b..c251f7a 100644 (file)
--- a/src/modules/module-pipe-source.c
+++ b/src/modules/module-pipe-source.c
@@ -82,9 +82,7 @@ static const char* const valid_modargs[] = {
 
 static void do_read(struct userdata *u) {
     ssize_t r;
-    void *p;
     pa_memchunk chunk;
-    
     assert(u);
 
     if (!pa_iochannel_is_readable(u->io))
@@ -97,22 +95,17 @@ static void do_read(struct userdata *u) {
         u->chunk.index = chunk.length = 0;
     }
 
-    assert(u->chunk.memblock);
-    assert(pa_memblock_get_length(u->chunk.memblock) > u->chunk.index);
-
-    p = pa_memblock_acquire(u->chunk.memblock);
-    if ((r = pa_iochannel_read(u->io, (uint8_t*) p + u->chunk.index, pa_memblock_get_length(u->chunk.memblock) - u->chunk.index)) <= 0) {
-        pa_memblock_release(u->chunk.memblock);
+    assert(u->chunk.memblock && u->chunk.memblock->length > u->chunk.index);
+    if ((r = pa_iochannel_read(u->io, (uint8_t*) u->chunk.memblock->data + u->chunk.index, u->chunk.memblock->length - u->chunk.index)) <= 0) {
         pa_log("read(): %s", pa_cstrerror(errno));
         return;
     }
-    pa_memblock_release(u->chunk.memblock);
 
     u->chunk.length = r;
     pa_source_post(u->source, &u->chunk);
     u->chunk.index += r;
 
-    if (u->chunk.index >= pa_memblock_get_length(u->chunk.memblock)) {
+    if (u->chunk.index >= u->chunk.memblock->length) {
         u->chunk.index = u->chunk.length = 0;
         pa_memblock_unref(u->chunk.memblock);
         u->chunk.memblock = NULL;