Merge HUGE set of changes temporarily into a branch, to allow me to move them from one machine to another (lock-free and stuff)

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1469 fefdeb5f-60dc-0310-8127-8f9354f1896f

1 files changed, 1 insertions, 0 deletions

diff --git a/src/pulse/internal.h b/src/pulse/internal.h
index 52354fdc..e5c9ef12 100644
--- a/src/pulse/internal.h
+++ b/src/pulse/internal.h
@@ -116,6 +116,7 @@ struct pa_stream {
     uint32_t requested_bytes;
 
     pa_memchunk peek_memchunk;
+    void *peek_data;
     pa_memblockq *record_memblockq;
 
     int corked;