[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.16-test6-4-g457b973

[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  57e1f84f03735c1f285a65cb154d8dd7a229a3b6 (commit)

- Log -----------------------------------------------------------------
457b973 Solaris: debug my latest enbugging, take 2
-----------------------------------------------------------------------

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

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

commit 457b973ba69d1a417d438b8716389464eb62e049
Author: Finn Thain <fthain at telegraphics.com.au>
Date:   Tue Aug 25 03:47:59 2009 +1000

    Solaris: debug my latest enbugging, take 2
    
    Prevent partially played memchunks from getting lost.
    If the sink has a memblock, don't leak it when rewinding.

diff --git a/src/modules/module-solaris.c b/src/modules/module-solaris.c
index 71f1407..b0d4db4 100644
--- a/src/modules/module-solaris.c
+++ b/src/modules/module-solaris.c
@@ -600,6 +600,10 @@ static void process_rewind(struct userdata *u) {
         pa_log_debug("Requested to rewind %lu bytes.", (unsigned long) rewind_nbytes);
         rewind_nbytes = PA_MIN(u->memchunk.length, rewind_nbytes);
         u->memchunk.length -= rewind_nbytes;
+        if (u->memchunk.length <= 0 && u->memchunk.memblock) {
+            pa_memblock_unref(u->memchunk.memblock);
+            pa_memchunk_reset(&u->memchunk);
+        }
         pa_log_debug("Rewound %lu bytes.", (unsigned long) rewind_nbytes);
     }
 
@@ -671,8 +675,8 @@ static void thread_func(void *userdata) {
                 if (len < (size_t) u->minimum_request)
                     break;
 
-                if (u->memchunk.length < len)
-                    pa_sink_render(u->sink, len - u->memchunk.length, &u->memchunk);
+                if (!u->memchunk.length)
+                    pa_sink_render(u->sink, u->sink->thread_info.max_request, &u->memchunk);
 
                 len = PA_MIN(u->memchunk.length, len);
 

-- 
hooks/post-receive
PulseAudio Sound Server