[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.19-491-gc6b9931

[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  34bb996e69156ceacda6e6c7530e129d4198eddb (commit)

- Log -----------------------------------------------------------------
c6b9931 virtual: when fixed block sizes are used the memblockq must have a silence block
-----------------------------------------------------------------------

Summary of changes:
 src/modules/module-virtual-sink.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

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

commit c6b9931bf109b175def6be581d1d946b48ed59d4
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Feb 25 02:41:09 2010 +0100

    virtual: when fixed block sizes are used the memblockq must have a silence block

diff --git a/src/modules/module-virtual-sink.c b/src/modules/module-virtual-sink.c
index 8a3ee0f..fac204d 100644
--- a/src/modules/module-virtual-sink.c
+++ b/src/modules/module-virtual-sink.c
@@ -504,7 +504,6 @@ int pa__init(pa_module*m) {
     u = pa_xnew0(struct userdata, 1);
     u->module = m;
     m->userdata = u;
-    u->memblockq = pa_memblockq_new(0, MEMBLOCKQ_MAXLENGTH, 0, pa_frame_size(&ss), 1, 1, 0, NULL);
     u->channels = ss.channels;
 
     /* Create sink */
@@ -584,7 +583,12 @@ int pa__init(pa_module*m) {
     u->sink_input->mute_changed = sink_input_mute_changed_cb;
     u->sink_input->userdata = u;
 
-    /* (9) INITIALIZE ANYTHING ELSE YOU NEED HERE */
+    /* (9) IF YOU REQUIRE A FIXED BLOCK SIZE MAKE SURE TO PASS A
+     * SILENCE MEMBLOCK AS LAST PARAMETER
+     * HERE. pa_sink_input_get_silence() IS USEFUL HERE. */
+    u->memblockq = pa_memblockq_new(0, MEMBLOCKQ_MAXLENGTH, 0, pa_frame_size(&ss), 1, 1, 0, NULL);
+
+    /* (10) INITIALIZE ANYTHING ELSE YOU NEED HERE */
 
     pa_sink_put(u->sink);
     pa_sink_input_put(u->sink_input);

-- 
hooks/post-receive
PulseAudio Sound Server