Merge HUGE set of changes temporarily into a branch, to allow me to move them from...

[pulseaudio] / src / tests / memblockq-test.c

diff --git a/src/tests/memblockq-test.c b/src/tests/memblockq-test.c
index af43d06f117c0e22fd8fd6c90c0095c1da87c5df..7ad3b2f3746dd900873c3dd86fae34f7fb18ae7d 100644 (file)
--- a/src/tests/memblockq-test.c
+++ b/src/tests/memblockq-test.c
@@ -2,17 +2,17 @@
 
 /***
   This file is part of PulseAudio.
- 
+
   PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
- 
+
   PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public License
   along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -32,47 +32,51 @@
 
 int main(int argc, char *argv[]) {
     int ret;
+
+    pa_mempool *p;
     pa_memblockq *bq;
     pa_memchunk chunk1, chunk2, chunk3, chunk4;
     pa_memblock *silence;
 
     pa_log_set_maximal_level(PA_LOG_DEBUG);
-    
-    silence = pa_memblock_new_fixed((char*)  "__", 2, 1, NULL);
+
+    p = pa_mempool_new(0);
+
+    silence = pa_memblock_new_fixed(p, (char*)  "__", 2, 1);
     assert(silence);
 
-    bq = pa_memblockq_new(0, 40, 10, 2, 4, 4, silence, NULL);
+    bq = pa_memblockq_new(0, 40, 10, 2, 4, 4, silence);
     assert(bq);
 
-    chunk1.memblock = pa_memblock_new_fixed((char*) "AA", 2, 1, NULL);
+    chunk1.memblock = pa_memblock_new_fixed(p, (char*) "AA", 2, 1);
     chunk1.index = 0;
     chunk1.length = 2;
     assert(chunk1.memblock);
-    
-    chunk2.memblock = pa_memblock_new_fixed((char*) "TTBB", 4, 1, NULL);
+
+    chunk2.memblock = pa_memblock_new_fixed(p, (char*) "TTBB", 4, 1);
     chunk2.index = 2;
     chunk2.length = 2;
     assert(chunk2.memblock);
 
-    chunk3.memblock = pa_memblock_new_fixed((char*) "ZZZZ", 4, 1, NULL);
+    chunk3.memblock = pa_memblock_new_fixed(p, (char*) "ZZZZ", 4, 1);
     chunk3.index = 0;
     chunk3.length = 4;
     assert(chunk3.memblock);
 
-    chunk4.memblock = pa_memblock_new_fixed((char*) "KKKKKKKK", 8, 1, NULL);
+    chunk4.memblock = pa_memblock_new_fixed(p, (char*) "KKKKKKKK", 8, 1);
     chunk4.index = 0;
     chunk4.length = 8;
     assert(chunk4.memblock);
 
     ret = pa_memblockq_push(bq, &chunk1);
     assert(ret == 0);
-    
+
     ret = pa_memblockq_push(bq, &chunk1);
     assert(ret == 0);
-    
+
     ret = pa_memblockq_push(bq, &chunk2);
     assert(ret == 0);
-    
+
     ret = pa_memblockq_push(bq, &chunk2);
     assert(ret == 0);
 
@@ -111,37 +115,39 @@ int main(int argc, char *argv[]) {
 
     chunk3.index += 2;
     chunk3.length -= 2;
-    
+
     ret = pa_memblockq_push(bq, &chunk3);
     assert(ret == 0);
-    
+
     printf(">");
 
     pa_memblockq_shorten(bq, 6);
-    
+
     for (;;) {
         pa_memchunk out;
         char *e;
         size_t n;
-        
+
         if (pa_memblockq_peek(bq, &out) < 0)
             break;
 
-        for (e = (char*) out.memblock->data + out.index, n = 0; n < out.length; n++)
+        p = pa_memblock_acquire(out.memblock);
+        for (e = (char*) p + out.index, n = 0; n < out.length; n++)
             printf("%c", *e);
+        pa_memblock_release(out.memblock);
 
         pa_memblock_unref(out.memblock);
         pa_memblockq_drop(bq, &out, out.length);
     }
-    
+
     printf("<\n");
-    
+
     pa_memblockq_free(bq);
     pa_memblock_unref(silence);
     pa_memblock_unref(chunk1.memblock);
     pa_memblock_unref(chunk2.memblock);
     pa_memblock_unref(chunk3.memblock);
     pa_memblock_unref(chunk4.memblock);
-    
+
     return 0;
 }