mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-19 08:57:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert r1404 and keep it on a development branch until it is fully tested.

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1409 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Pierre Ossman 2006-11-06 13:06:01 +00:00
parent 6ca819354c
commit 8dc6214276
36 changed files with 499 additions and 990 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/pulsecore/sink-input.c
View file

@ -294,7 +294,6 @@ int pa_sink_input_peek(pa_sink_input *i, pa_memchunk *chunk, pa_cvolume *volume)
assert(i->state == PA_SINK_INPUT_RUNNING || i->state == PA_SINK_INPUT_DRAINED);
if (i->move_silence > 0) {
size_t l;
/* We have just been moved and shall play some silence for a
* while until the old sink has drained its playback buffer */
@ -304,8 +303,7 @@ int pa_sink_input_peek(pa_sink_input *i, pa_memchunk *chunk, pa_cvolume *volume)
chunk->memblock = pa_memblock_ref(i->silence_memblock);
chunk->index = 0;
l = pa_memblock_get_length(chunk->memblock);
chunk->length = i->move_silence < l ? i->move_silence : l;
chunk->length = i->move_silence < chunk->memblock->length ? i->move_silence : chunk->memblock->length;
ret = 0;
do_volume_adj_here = 1;
@ -391,13 +389,10 @@ void pa_sink_input_drop(pa_sink_input *i, const pa_memchunk *chunk, size_t lengt
if (i->move_silence > 0) {
if (chunk) {
size_t l;
l = pa_memblock_get_length(i->silence_memblock);
if (chunk->memblock != i->silence_memblock ||
chunk->index != 0 ||
(chunk->memblock && (chunk->length != (l < i->move_silence ? l : i->move_silence))))
(chunk->memblock && (chunk->length != (i->silence_memblock->length < i->move_silence ? i->silence_memblock->length : i->move_silence))))
return;
}