summaryrefslogtreecommitdiffstats
path: root/src/modules/module-virtual-sink.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-02-25 02:10:45 +0100
committerLennart Poettering <lennart@poettering.net>2010-02-25 02:10:45 +0100
commit87cc741d0e10f58c5d9c4b40a213ba9a689cff14 (patch)
tree06a792c2d0f6f5b165966deadf0f23917231bb32 /src/modules/module-virtual-sink.c
parent5030852c8e4c0a24a3a42e5583358daaad7ec0df (diff)
memblockq: implement new call pa_memblockq_peek_fixed_size()
Diffstat (limited to 'src/modules/module-virtual-sink.c')
-rw-r--r--src/modules/module-virtual-sink.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/modules/module-virtual-sink.c b/src/modules/module-virtual-sink.c
index de8ea585..d4450da6 100644
--- a/src/modules/module-virtual-sink.c
+++ b/src/modules/module-virtual-sink.c
@@ -220,7 +220,6 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk
pa_assert(tchunk.length > 0);
fs = pa_frame_size(&i->sample_spec);
- //n = (unsigned) (PA_MIN(tchunk.length, u->block_size) / fs);
n = (unsigned) (tchunk.length / fs);
pa_assert(n > 0);
@@ -228,7 +227,6 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk
chunk->index = 0;
chunk->length = n*fs;
chunk->memblock = pa_memblock_new(i->sink->core->mempool, chunk->length);
- pa_assert( chunk->memblock );
pa_memblockq_drop(u->memblockq, chunk->length);
@@ -240,8 +238,8 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk
/* As an example, copy input to output */
for (c = 0; c < u->channels; c++) {
pa_sample_clamp(PA_SAMPLE_FLOAT32NE,
- dst+c, u->channels*sizeof(float),
- src+c, u->channels*sizeof(float),
+ dst+c, u->channels * sizeof(float),
+ src+c, u->channels * sizeof(float),
n);
}