[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.12-136-g5996f59

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  6d52a4130789e59b6c8d83e151230180cbd39493 (commit)

- Log -----------------------------------------------------------------
5996f59... update module-tunnel for recent protocol changes
f728e9c... disable valgrind macro usage for now since valgrind generates a lot of spurious warnings as it seems
-----------------------------------------------------------------------

Summary of changes:
 src/modules/module-tunnel.c |    9 ++++++++-
 src/pulsecore/memblock.c    |   18 +++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

-----------------------------------------------------------------------

commit f728e9cce060ded8db40b82e02683331252f6cc5
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sun Oct 5 22:51:25 2008 +0200

    disable valgrind macro usage for now since valgrind generates a lot of spurious warnings as it seems

diff --git a/src/pulsecore/memblock.c b/src/pulsecore/memblock.c
index 400a4e1..d9e1bf1 100644
--- a/src/pulsecore/memblock.c
+++ b/src/pulsecore/memblock.c
@@ -261,9 +261,11 @@ static struct mempool_slot* mempool_allocate_slot(pa_mempool *p) {
         }
     }
 
-#ifdef HAVE_VALGRIND_MEMCHECK_H
-    VALGRIND_MALLOCLIKE_BLOCK(slot, p->block_size, 0, 0);
-#endif
+/* #ifdef HAVE_VALGRIND_MEMCHECK_H */
+/*     if (PA_UNLIKELY(pa_in_valgrind())) { */
+/*         VALGRIND_MALLOCLIKE_BLOCK(slot, p->block_size, 0, 0); */
+/*     } */
+/* #endif */
 
     return slot;
 }
@@ -534,16 +536,18 @@ static void memblock_free(pa_memblock *b) {
 
             call_free = b->type == PA_MEMBLOCK_POOL_EXTERNAL;
 
+/* #ifdef HAVE_VALGRIND_MEMCHECK_H */
+/*             if (PA_UNLIKELY(pa_in_valgrind())) { */
+/*                 VALGRIND_FREELIKE_BLOCK(slot, b->pool->block_size); */
+/*             } */
+/* #endif */
+
             /* The free list dimensions should easily allow all slots
              * to fit in, hence try harder if pushing this slot into
              * the free list fails */
             while (pa_flist_push(b->pool->free_slots, slot) < 0)
                 ;
 
-#ifdef HAVE_VALGRIND_MEMCHECK_H
-            VALGRIND_FREELIKE_BLOCK(slot, b->pool->block_size);
-#endif
-
             if (call_free)
                 if (pa_flist_push(PA_STATIC_FLIST_GET(unused_memblocks), b) < 0)
                     pa_xfree(b);

commit 5996f59dd5e13d10da9a2c95f0040e48f7a7696e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sun Oct 5 23:02:25 2008 +0200

    update module-tunnel for recent protocol changes

diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
index de3c727..4bbb11a 100644
--- a/src/modules/module-tunnel.c
+++ b/src/modules/module-tunnel.c
@@ -159,7 +159,7 @@ static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = {
     [PA_COMMAND_PLAYBACK_STREAM_SUSPENDED] = command_suspended,
     [PA_COMMAND_RECORD_STREAM_SUSPENDED] = command_suspended,
     [PA_COMMAND_PLAYBACK_STREAM_MOVED] = command_moved,
-    [PA_COMMAND_RECORD_STREAM_MOVED] = command_moved,
+    [PA_COMMAND_RECORD_STREAM_MOVED] = command_moved
 };
 
 struct userdata {
@@ -1494,6 +1494,13 @@ static void setup_complete_callback(pa_pdispatch *pd, uint32_t command, uint32_t
 #endif
     }
 
+    if (u->version >= 14) {
+#ifdef TUNNEL_SINK
+        pa_tagstruct_put_boolean(reply, FALSE); /* volume_set */
+#endif
+        pa_tagstruct_put_boolean(reply, TRUE); /* early rquests */
+    }
+
     pa_pstream_send_tagstruct(u->pstream, reply);
     pa_pdispatch_register_reply(u->pdispatch, tag, DEFAULT_TIMEOUT, create_stream_callback, u, NULL);
 

-- 
hooks/post-receive
PulseAudio Sound Server