[pulseaudio-commits] r2548 - /trunk/src/pulsecore/protocol-native.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Tue Jun 17 22:08:08 2008
New Revision: 2548

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2548&root=pulseaudio&view=rev
Log:
reset prebuf if it is too large

Modified:
    trunk/src/pulsecore/protocol-native.c

Modified: trunk/src/pulsecore/protocol-native.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulsecore/protocol-native.c?rev=2548&root=pulseaudio&r1=2547&r2=2548&view=diff
==============================================================================
--- trunk/src/pulsecore/protocol-native.c (original)
+++ trunk/src/pulsecore/protocol-native.c Tue Jun 17 22:08:08 2008
@@ -812,7 +812,7 @@
     if (*tlength <= *minreq)
         *tlength =  *minreq*2 + frame_size;
 
-    if (*prebuf <= 0)
+    if (*prebuf <= 0 || *prebuf > *tlength)
         *prebuf = *tlength;
 }
 
@@ -1290,7 +1290,7 @@
 
     if (pa_memblockq_peek(s->memblockq, chunk) < 0) {
 
-/*         pa_log("UNDERRUN: %lu", pa_memblockq_get_length(s->memblockq)); */
+/*         pa_log("UNDERRUN: %lu", (unsigned long) pa_memblockq_get_length(s->memblockq)); */
 
         if (s->drain_request && pa_sink_input_safe_to_remove(i)) {
             s->drain_request = FALSE;