summaryrefslogtreecommitdiffstats
path: root/src/sink.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2004-07-03 00:19:17 +0000
committerLennart Poettering <lennart@poettering.net>2004-07-03 00:19:17 +0000
commit741aa44ffc8afd63cd29e5ae46f778dc68340df8 (patch)
tree2838bb11c8db75119cc3224ee7c93fb195e468d5 /src/sink.c
parent13b35a2489e7e1d6341effe6e25b8cb8a0a94a02 (diff)
add resampling
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@45 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/sink.c')
-rw-r--r--src/sink.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/sink.c b/src/sink.c
index 8a510f1b..2ecb6445 100644
--- a/src/sink.c
+++ b/src/sink.c
@@ -90,8 +90,7 @@ static unsigned fill_mix_info(struct sink *s, struct mix_info *info, unsigned ma
assert(s && info);
for (i = idxset_first(s->inputs, &index); maxinfo > 0 && i; i = idxset_next(s->inputs, &index)) {
- assert(i->peek);
- if (i->peek(i, &info->chunk) < 0)
+ if (sink_input_peek(i, &info->chunk) < 0)
continue;
info->volume = i->volume;
@@ -115,11 +114,10 @@ static void inputs_drop(struct sink *s, struct mix_info *info, unsigned maxinfo,
assert(i && info->chunk.memblock);
memblock_unref(info->chunk.memblock);
- assert(i->drop);
- i->drop(i, length);
+ sink_input_drop(i, length);
}
}
-
+
int sink_render(struct sink*s, size_t length, struct memchunk *result) {
struct mix_info info[MAX_MIX_CHANNELS];
unsigned n;