From 3536be420cf9ec6f4f8fbe1dc60b2da0cefba86c Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 6 Sep 2004 18:55:47 +0000
Subject: correct a recording bug in native protocol

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@181 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 doc/todo                |  1 +
 polyp/Makefile.am       |  4 ++--
 polyp/protocol-native.c | 12 +++++++-----
 polyp/sink.c            |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/doc/todo b/doc/todo
index 62debb6e..f48859e0 100644
--- a/doc/todo
+++ b/doc/todo
@@ -14,6 +14,7 @@
 - config file for command line arguments
 - vumeter
 - add FAQ
+- pa_context_connect_spawn() change function to fork+exec+waitpid-like function
 
 ** later ***
 - xmlrpc/http
diff --git a/polyp/Makefile.am b/polyp/Makefile.am
index 27ada2e1..39215497 100644
--- a/polyp/Makefile.am
+++ b/polyp/Makefile.am
@@ -398,11 +398,11 @@ mainloop_test_glib12_SOURCES = $(mainloop_test_SOURCES)
 mainloop_test_glib12_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB12_CFLAGS) -DGLIB_MAIN_LOOP
 mainloop_test_glib12_LDADD = $(mainloop_test_LDADD) $(GLIB12_LIBS) libpolyp-mainloop-glib12.la
 
-cpulimit_test_SOURCES = cpulimit-test.c cpulimit.c util.c
+cpulimit_test_SOURCES = cpulimit-test.c cpulimit.c util.c log.c
 cpulimit_test_CFLAGS = $(AM_CFLAGS)
 cpulimit_test_LDADD = $(AM_LDADD) libpolyp-mainloop.la
 
-cpulimit_test2_SOURCES = cpulimit-test.c cpulimit.c util.c
+cpulimit_test2_SOURCES = cpulimit-test.c cpulimit.c util.c log.c
 cpulimit_test2_CFLAGS = $(AM_CFLAGS) -DTEST2
 cpulimit_test2_LDADD = $(AM_LDADD) libpolyp-mainloop.la
 
diff --git a/polyp/protocol-native.c b/polyp/protocol-native.c
index 67352b3f..1ec1b608 100644
--- a/polyp/protocol-native.c
+++ b/polyp/protocol-native.c
@@ -378,12 +378,14 @@ static void send_memblock(struct connection *c) {
             return;
 
         if (pa_memblockq_peek(r->memblockq,  &chunk) >= 0) {
-            if (chunk.length > r->fragment_size)
-                chunk.length = r->fragment_size;
+            struct pa_memchunk schunk = chunk;
+            
+            if (schunk.length > r->fragment_size)
+                schunk.length = r->fragment_size;
 
-            pa_pstream_send_memblock(c->pstream, r->index, 0, &chunk);
-            pa_memblockq_drop(r->memblockq, &chunk, chunk.length);
-            pa_memblock_unref(chunk.memblock);
+            pa_pstream_send_memblock(c->pstream, r->index, 0, &schunk);
+            pa_memblockq_drop(r->memblockq, &chunk, schunk.length);
+            pa_memblock_unref(schunk.memblock);
             
             return;
         }
diff --git a/polyp/sink.c b/polyp/sink.c
index 9b8a6492..1fe38e9f 100644
--- a/polyp/sink.c
+++ b/polyp/sink.c
@@ -158,7 +158,7 @@ int pa_sink_render(struct pa_sink*s, size_t length, struct pa_memchunk *result)
     unsigned n;
     size_t l;
     assert(s && length && result);
-    
+
     n = fill_mix_info(s, info, MAX_MIX_CHANNELS);
 
     if (n <= 0)
-- 
cgit