summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-06-17 20:08:08 +0000
committerLennart Poettering <lennart@poettering.net>2008-06-17 20:08:08 +0000
commitba64de8f3c0257e7cd410c7f77479216909c6c9a (patch)
tree04b4c3f6831002a2569b0c4bcfb148b465e79b7c
parent038a033c78c60a03b8c984ffc32f9efc324fba16 (diff)
reset prebuf if it is too large
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2548 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulsecore/protocol-native.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 9d609309..b5d30f2c 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -812,7 +812,7 @@ static void fix_playback_buffer_attr_pre(playback_stream *s, pa_bool_t adjust_la
if (*tlength <= *minreq)
*tlength = *minreq*2 + frame_size;
- if (*prebuf <= 0)
+ if (*prebuf <= 0 || *prebuf > *tlength)
*prebuf = *tlength;
}
@@ -1290,7 +1290,7 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk
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;